diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-11-10 18:43:53 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-11-10 19:43:55 +0100 |
| commit | b96d48efca870e15efda49bf935a7542b4b8037e (patch) | |
| tree | 7cfd70c787f52b72ddf5f05f01af17561ca3d35f | |
| parent | 129756a9c2bd89f10b2bc9a2b39d6c204d7d67fc (diff) | |
| download | NetworkManager-b96d48efca870e15efda49bf935a7542b4b8037e.tar.gz | |
gitlab-ci: fix building artifacts (pages) during gitlab-ci test
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d64f07dd61..233f3ae425 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,8 @@ variables: CENTOS_EXEC: 'bash .gitlab-ci/centos-install.sh' .nm_artifacts: + variables: + NM_BUILD_TARBALL: 1 artifacts: expire_in: 2 days paths: @@ -60,6 +62,8 @@ variables: - NetworkManager-1*.src.rpm .nm_artifacts_undo: + variables: + NM_BUILD_TARBALL: 0 artifacts: paths: [] diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh index 612e98d1f2..b3f6863582 100755 --- a/.gitlab-ci/build.sh +++ b/.gitlab-ci/build.sh @@ -35,8 +35,8 @@ do_clean; BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scri do_clean; test $IS_FEDORA = 1 -o $IS_CENTOS = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -W meson do_clean; test $IS_FEDORA = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson +do_clean if [ "$NM_BUILD_TARBALL" = 1 ]; then - do_clean SIGN_SOURCE=0 ./contrib/fedora/rpm/build_clean.sh -r mv ./NetworkManager-1*.tar.xz /tmp/ mv ./contrib/fedora/rpm/latest/SRPMS/NetworkManager-1*.src.rpm /tmp/ diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index e2291bf036..4b4060c0fb 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -42,6 +42,8 @@ variables: {% endfor %} .nm_artifacts: + variables: + NM_BUILD_TARBALL: 1 artifacts: expire_in: 2 days paths: @@ -50,6 +52,8 @@ variables: - NetworkManager-1*.src.rpm .nm_artifacts_undo: + variables: + NM_BUILD_TARBALL: 0 artifacts: paths: [] |