diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-27 18:07:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-27 18:07:24 +0300 |
| commit | eedc7b50be0121effa4ea03862c045cf6114c944 (patch) | |
| tree | 05a5bc2747a4534bc8104fd49adc1cbf3f0c95d8 /scripts | |
| parent | 79b3bd3f6652f114f14afff08f6ed9e9018aa782 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/allowed_warnings.txt | 10 | ||||
| -rw-r--r-- | scripts/utils.sh | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/allowed_warnings.txt b/scripts/allowed_warnings.txt index 8162f45f760..19bd5d51a20 100644 --- a/scripts/allowed_warnings.txt +++ b/scripts/allowed_warnings.txt @@ -1,11 +1,15 @@ # List of ignored warnings used by `fail_on_warnings` in `scripts/utils.sh`. -# Each line represents a match used by `grep --invert-match --file`. +# Each line is a regexp and represents a match used by +# `grep --invert-match --extended-regexp --file`. # Comments and empty lines are ignored. # https://github.com/browserslist/browserslist/blob/d0ec62eb48c41c218478cd3ac28684df051cc865/node.js#L329 # warns if caniuse-lite package is older than 6 months. Ignore this # warning message so that GitLab backports don't fail. -Browserslist: caniuse-lite is outdated. Please run next command `yarn upgrade` +Browserslist: caniuse-lite is outdated\. Please run next command `yarn upgrade` # https://github.com/mime-types/mime-types-data/pull/50#issuecomment-1060908930 -Type application/netcdf is already registered as a variant of application/netcdf. +Type application/netcdf is already registered as a variant of application/netcdf\. + +# This warning is emitted by scripts/static-analysis. +\*\*\*\* .+ had the following warning\(s\): diff --git a/scripts/utils.sh b/scripts/utils.sh index 151b58f0db2..0d120473bb6 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -124,7 +124,7 @@ function fail_on_warnings() { local warnings # Filter out allowed warnings from stderr. # Turn grep errors into warnings so we fail later. - warnings=$(grep --invert-match --file "$allowed_warning_file" "$warning_file" 2>&1 || true) + warnings=$(grep --invert-match --extended-regexp --file "$allowed_warning_file" "$warning_file" 2>&1 || true) rm -f "$allowed_warning_file" |