Skip to content

Commit 0478e21

Browse files
committed
ci(check-pr): use literal comparison
1 parent 12041f5 commit 0478e21

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

.github/workflows/check-pr.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,14 @@ jobs:
5858
for label in build chore ci docs feat fix perf refactor test style ; do
5959
if [[ "${label}" == "${type}" ]]; then
6060
echo "Label to add: ${label}"
61-
# shellcheck disable=SC2076
62-
if [[ "${PR_LABELS}" =~ "\"${label}\"" ]] ; then
61+
if [[ "${PR_LABELS}" == *"${label}"* ]] ; then
6362
echo "Label ${label} already present"
6463
else
6564
add_labels+=("${label}")
6665
fi
6766
else
6867
echo "Label to remove: ${label}"
69-
# shellcheck disable=SC2076
70-
if [[ "${PR_LABELS}" =~ "\"${label}\"" ]] ; then
68+
if [[ "${PR_LABELS}" == *"${label}"* ]] ; then
7169
remove_labels+=("${label}")
7270
else
7371
echo "Label ${label} not present"
@@ -78,8 +76,7 @@ jobs:
7876
regexp2='^[a-zA-Z0-9]+\([a-zA-Z0-9\-]*deps\)$'
7977
if [[ "${scoped_type}" =~ ${regexp2} ]] ; then
8078
echo "Label to add: dependencies"
81-
# shellcheck disable=SC2076
82-
if [[ "${PR_LABELS}" =~ "\"dependencies\"" ]] ; then
79+
if [[ "${PR_LABELS}" == *"dependencies"* ]] ; then
8380
echo "Label dependencies already present"
8481
else
8582
add_labels+=('dependencies')
@@ -93,16 +90,14 @@ jobs:
9390
|| "${type}" == 'style' \
9491
|| "${type}" == 'test' ]] ; then
9592
echo "Label to add: no-release-notes"
96-
# shellcheck disable=SC2076
97-
if [[ "${PR_LABELS}" =~ "\"no-release-notes\"" ]] ; then
93+
if [[ "${PR_LABELS}" == *"no-release-notes"* ]] ; then
9894
echo "Label no-release-notes already present"
9995
else
10096
add_labels+=('no-release-notes')
10197
fi
10298
else
10399
echo "Label to remove: no-release-notes"
104-
# shellcheck disable=SC2076
105-
if [[ "${PR_LABELS}" =~ "\"no-release-notes\"" ]] ; then
100+
if [[ "${PR_LABELS}" == *"no-release-notes"* ]] ; then
106101
remove_labels+=('no-release-notes')
107102
else
108103
echo "Label no-release-notes not present"

openid-connect-provider-debugger/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# checkov:skip=CKV_DOCKER_3
2-
# trivy:ignore:AVD-DS-0002
1+
# checkov:skip=CKV_DOCKER_3: [Missing USER]: inherited from parent image
2+
# trivy:ignore:AVD-DS-0002: [Missing USER]: inherited from parent image
33
FROM openresty/openresty:1.27.1.2-3-alpine-fat@sha256:eb0d368d262cc82b867d88f48b49a93ad9247436b65d459a14940d28ccd0e67b
44

55
ARG LUA_RESTY_OPENIDC_VERSION="1.8.0-1"
@@ -10,7 +10,6 @@ HEALTHCHECK CMD ["/usr/bin/curl", "-ifsSL", "http://localhost"]
1010

1111
COPY nginx.conf.patch /usr/local/openresty/nginx/conf/
1212

13-
# hadolint ignore=DL3019
1413
RUN apk upgrade --no-cache \
1514
&& apk add --no-cache \
1615
curl=8.12.1-r1 \

openid-connect-provider-debugger/Dockerfile-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG USER_GECOS=Default
1111

1212
SHELL ["/bin/ash", "-euo", "pipefail", "-c"]
1313

14-
# hadolint ignore=DL3018
14+
# hadolint ignore=DL3018 [Pin versions in apk add]: not required for testing
1515
RUN apk add --no-cache curl
1616

1717
RUN adduser \

0 commit comments

Comments
 (0)