diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-09-16 08:46:17 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-09-16 08:47:38 +0200 |
| commit | 82a6f2c465fb852b02004a5a4c6a719926881016 (patch) | |
| tree | 8c69f85fc291434b60020f6d3dce15daa929eb94 | |
| parent | 1a56dcd4da9f93598b3e9b0336bac67f6b482e04 (diff) | |
| download | NetworkManager-82a6f2c465fb852b02004a5a4c6a719926881016.tar.gz | |
contrib: explicitly pass "-n" to "nm-code-format.sh" in gitlab-ci check-tree job
"nm-code-format.sh" is going to change the default behavior from "-n" to
"-i", that is, from check-only to reformat. Explicitly pass "-n" where
we want it.
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3f0e6c43a..22de239b18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-08-30.0-0c3a9d498488' - UBUNTU_TAG: '2021-08-30.0-6c770997f83b' - DEBIAN_TAG: '2021-08-30.0-6c770997f83b' - CENTOS_TAG: '2021-08-30.0-0c3a9d498488' - ALPINE_TAG: '2021-08-30.0-85f7bea6144e' + FEDORA_TAG: '2021-08-30.0-cd3afeeac844' + UBUNTU_TAG: '2021-08-30.0-6414c66cfe63' + DEBIAN_TAG: '2021-08-30.0-6414c66cfe63' + CENTOS_TAG: '2021-08-30.0-cd3afeeac844' + ALPINE_TAG: '2021-08-30.0-098c1144d4d6' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -941,7 +941,7 @@ check-tree: script: - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc - - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh + - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code pages: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index ee28a32b07..5f8b9eeb77 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -204,7 +204,7 @@ check-tree: script: - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc - - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh + - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code pages: |