diff options
| author | Andrei Pavel <andrei@isc.org> | 2020-12-30 12:17:51 +0100 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2020-12-30 14:56:21 +0100 |
| commit | eaec7339e53ea4a91a42328d3c467e9d59ca39b6 (patch) | |
| tree | 041f15fe73a4b3a3a3e4004de1e7ab1f1938a04a | |
| parent | [#1602] add ChangeLog entry (diff) | |
| download | kea-eaec7339e53ea4a91a42328d3c467e9d59ca39b6.tar.xz kea-eaec7339e53ea4a91a42328d3c467e9d59ca39b6.zip | |
[#1602] solve CI issues
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | tools/print-generated-files.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index daf5506072..a2aaae9bf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,5 +141,5 @@ missing-git-attribute: - amd64 script: - test -z $(git diff) - - ./tools/print-generated-files -a + - ./tools/print-generated-files.sh -a - test -z $(git diff) diff --git a/tools/print-generated-files.sh b/tools/print-generated-files.sh index 080df861d8..d720c3637d 100755 --- a/tools/print-generated-files.sh +++ b/tools/print-generated-files.sh @@ -117,13 +117,13 @@ print_file_name() { } # Generated messages +# shellcheck disable=SC1003 +# SC1003: Want to escape a single quote? echo 'This is how it'\''s done' +# reason: No, we don't want to escape a single quote, we want a backslash. print_generated_messages() { local makefile_am=${1}; shift local directory=${1}; shift - # shellcheck disable=SC1003 - # SC1003: Want to escape a single quote? echo 'This is how it'\''s done' - # reason: No, we don't want to escape a single quote, we want a backslash. for j in $(grep -F 'messages:' "${makefile_am}" | cut -d ':' -f '2-' | \ cut -d '\' -f 1); do print_file_name "${directory}/${j}" |