diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-20 08:31:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-20 08:56:30 +0200 |
| commit | 69652d40f728a0e16bb96375d43b33af2fd50212 (patch) | |
| tree | 59e9cce278972ff168fa52011c8a5118469e5341 | |
| parent | 6ea499ac4028357f66956a53a19dea41af93748c (diff) | |
| download | NetworkManager-69652d40f728a0e16bb96375d43b33af2fd50212.tar.gz | |
gitlab-ci: don't use "test && cmd" in build step
We don't want stesp to return an error, which is what
"test && cmd" does, if the test evaluates to false.
Instead, use "! test || cmd" which has more the semantics
that we want.
(cherry picked from commit 2a2c58339b0007578026c6fb8dda824c0a76883d)
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffcf652117..5c733d62d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,8 +30,8 @@ stages: - date '+%Y%m%d-%H%M%S'; locale -a - date '+%Y%m%d-%H%M%S'; env - date '+%Y%m%d-%H%M%S'; meson --version - - date '+%Y%m%d-%H%M%S'; which dnf && dnf list --installed - - date '+%Y%m%d-%H%M%S'; which dpkg && dpkg -l + - date '+%Y%m%d-%H%M%S'; ! which dnf || dnf list --installed + - date '+%Y%m%d-%H%M%S'; ! which dpkg || dpkg -l - date '+%Y%m%d-%H%M%S'; git clean -fdx ; BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh - 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 ; BUILD_TYPE=meson CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh |