diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-11-10 19:05:02 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-11-10 19:06:03 +0100 |
| commit | 129756a9c2bd89f10b2bc9a2b39d6c204d7d67fc (patch) | |
| tree | e86941e329ca196efef99a74aa8d1daea2366436 | |
| parent | 869ff96ad19645761702dd73bb6fcaaf69c26a11 (diff) | |
| download | NetworkManager-129756a9c2bd89f10b2bc9a2b39d6c204d7d67fc.tar.gz | |
gitlab-ci: skip python black check during `make check` for builds
We now install black by default via REQUIRED_PACKAGES script.
Thus, also when we build on Fedora 30, `make check` would run
python black. However, the formatting depends on the version
of python black, and the one in Fedora 30 is not right.
Skip all black tests during `make check`. We have a deicated
gitlab-ci test that runs black already (with the desired version
of black).
| -rwxr-xr-x | .gitlab-ci/build.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh index 214fb83435..612e98d1f2 100755 --- a/.gitlab-ci/build.sh +++ b/.gitlab-ci/build.sh @@ -19,6 +19,12 @@ meson --version ! which dpkg || dpkg -l ! which yum || yum list installed +# The formatting depends on the version of python black. +# We have a dedicated test that checks our formatting, which +# uses the right version. We should disable the check during +# `make check`. +export NMTST_SKIP_PYTHON_BLACK=1 + do_clean; BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh rm -rf /tmp/nm-docs-html; mv build/INST/share/gtk-doc/html /tmp/nm-docs-html |