diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-04 11:30:55 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-05 13:49:20 +0100 |
| commit | f1714b485d00cfc9806ba9d46b4ba76221afae19 (patch) | |
| tree | b4c52fc13bcf84538cdda23f7e62bf9a862a9731 | |
| parent | f444188b63d6d8ded2cb3748e4b8ee87f4a1e531 (diff) | |
| download | NetworkManager-f1714b485d00cfc9806ba9d46b4ba76221afae19.tar.gz | |
gitlab-ci: minor cleanup of "contrib/scripts/nm-ci-run.sh" script
| -rwxr-xr-x | contrib/scripts/nm-ci-run.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/contrib/scripts/nm-ci-run.sh b/contrib/scripts/nm-ci-run.sh index ca98d8965f..4ac5fd9684 100755 --- a/contrib/scripts/nm-ci-run.sh +++ b/contrib/scripts/nm-ci-run.sh @@ -1,5 +1,11 @@ #!/bin/bash +# Arguments via environment variables: +# - CI +# - CC +# - BUILD_TYPE +# - CFLAGS + set -exv die() { @@ -16,7 +22,7 @@ elif [ "$BUILD_TYPE" == autotools ]; then _TRUE=yes _FALSE=no else - die "invalid BUILD_TYPE \"$BUILD_TYPE\"" + die "invalid \$BUILD_TYPE \"$BUILD_TYPE\"" fi _WITH_CRYPTO="gnutls" @@ -24,14 +30,16 @@ _WITH_MORE_WARNINGS="error" _WITH_LIBTEAM="$_TRUE" _WITH_DOCS="$_TRUE" _WITH_SYSTEMD_LOGIND="$_TRUE" + if [ "$CI" == travis ]; then _WITH_MORE_WARNINGS="no" _WITH_LIBTEAM="$_FALSE" _WITH_DOCS="$_FALSE" _WITH_SYSTEMD_LOGIND="$_FALSE" -fi -if [ "$CI" == gitlab ]; then +elif [ "$CI" == gitlab ]; then : +else + die "invalid \$CI \"$CI\"" fi if [ "$CC" != gcc ]; then _WITH_CRYPTO=nss |