summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-02-08 19:01:52 +0100
committerThomas Haller <thaller@redhat.com>2019-02-08 20:14:19 +0100
commitdc4f6f665689a0f3b269cd8465888fbeb2f40fd5 (patch)
treeb6ca93d6d3dc7f2e99cc8d6eb2f8e8d33e45c3cb
parentaacb3c4f5b59e1728f01ede6cddc0d9267611e86 (diff)
downloadNetworkManager-dc4f6f665689a0f3b269cd8465888fbeb2f40fd5.tar.gz
gitlab-ci: fix moving docs-html
Seems .git directory is somehow shared/cached between CI runs. Use /tmp instead.
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff7455911b..1831b43ee7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,13 +19,13 @@ stages:
stage: test
script:
- date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh
- - date '+%Y%m%d-%H%M%S'; mv build/INST/share/gtk-doc/html .git/docs-html
+ - date '+%Y%m%d-%H%M%S'; rm -rf /tmp/nm-docs-html; mv build/INST/share/gtk-doc/html /tmp/nm-docs-html
- date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=meson CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh
- date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=autotools CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh
- date '+%Y%m%d-%H%M%S'; git clean -fdx ; CI=gitlab BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh
- date '+%Y%m%d-%H%M%S'; ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test
- date '+%Y%m%d-%H%M%S'; ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson
- - date '+%Y%m%d-%H%M%S'; mv .git/docs-html .
+ - date '+%Y%m%d-%H%M%S'; mv /tmp/nm-docs-html ./docs-html
checkpatch:
image: fedora:28