diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-08 07:40:32 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-08 08:08:07 +0100 |
| commit | 211ac0ddad4a4a45f1602c32a386255536ed87a1 (patch) | |
| tree | 6fd0866487fd9b18a86a7ea156d200fa67e674cd | |
| parent | 7b8a9a2927103859d4f4f876b07a066d1eebf625 (diff) | |
| download | NetworkManager-211ac0ddad4a4a45f1602c32a386255536ed87a1.tar.gz | |
gitlab-ci: fix generating pages
Fixes: bdac03fe9a8def21ef16bdd7bd0497dab83fbb1f
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4dffc40b5..68fd86fafa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,17 +18,14 @@ stages: .fedora_script: &fedora_script stage: test script: - - CI=gitlab BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh - - mv build/INST/share/gtk-doc/html /tmp/docs-html - - git clean -fdx - - CI=gitlab BUILD_TYPE=autotools CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh - - git clean -fdx - - CI=gitlab BUILD_TYPE=meson CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh - - git clean -fdx - - CI=gitlab BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh - - git clean -fdx + - git clean -fdx ; CI=gitlab BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh + - mv build/INST/share/gtk-doc/html .git/docs-html + - git clean -fdx ; CI=gitlab BUILD_TYPE=meson CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh + - git clean -fdx ; CI=gitlab BUILD_TYPE=autotools CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh + - git clean -fdx ; CI=gitlab BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh - ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test - ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson + - mv .git/docs-html . checkpatch: image: fedora:28 @@ -49,7 +46,7 @@ f28_build: artifacts: expire_in: 1 day paths: - - /tmp/docs-html + - docs-html f_latest_build: <<: *fedora_install |