Skip to content

Commit 7cadb29

Browse files
committed
Exclude existing errors
1 parent 79cb601 commit 7cadb29

File tree

8 files changed

+15
-9
lines changed

8 files changed

+15
-9
lines changed

.github/workflows/ci-build.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,13 @@ jobs:
335335
working-directory: ui/
336336

337337
shellcheck:
338-
runs-on: ubuntu-22.04
338+
runs-on: ubuntu-latest
339339
steps:
340340
- uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694 # v4.0.0
341341
- run: |
342342
sudo apt-get install shellcheck
343-
shellcheck $(find . -name '*.sh') | tee sc.log
344-
expr $(cat sc.log | wc -l) \<= $(cat test/sc-orig.log | wc -l)
343+
shellcheck -e SC2086 -e SC2046 -e SC2068 -e SC2206 -e SC2048 -e SC2059 -e SC2154 -e SC2034 -e SC2016 -e SC2128 -e SC1091 -e SC2207 $(find . -type f -name '*.sh') | tee sc.log
344+
test ! -s sc.log
345345
346346
analyze:
347347
name: Process & analyze test artifacts

generate-snyk-report.sh

Whitespace-only changes.

hack/generate-actions-list.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
find resource_customizations -name action.lua | sed 's/resource_customizations\/\(.*\)\/actions\/\(.*\)\/action.lua/- [\1\/\2](https:\/\/github.com\/argoproj\/argo-cd\/blob\/master\/resource_customizations\/\1\/actions\/\2\/action.lua)/' | sort | uniq > docs/operator-manual/resource_actions_builtin.md
1+
#!/usr/bin/env bash
2+
3+
find resource_customizations -name action.lua | sed 's/resource_customizations\/\(.*\)\/actions\/\(.*\)\/action.lua/- [\1\/\2](https:\/\/github.com\/argoproj\/argo-cd\/blob\/master\/resource_customizations\/\1\/actions\/\2\/action.lua)/' | sort | uniq > docs/operator-manual/resource_actions_builtin.md

hack/trigger-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414

1515
# Target (version) tag must match version scheme vMAJOR.MINOR.PATCH with an
1616
# optional pre-release tag.
17-
if ! echo "${NEW_TAG}" | egrep -q '^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)*$'; then
17+
if ! echo "${NEW_TAG}" | grep -E -q '^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)*$'; then
1818
echo "!! Malformed version tag: '${NEW_TAG}', must match 'vMAJOR.MINOR.PATCH(-rcX)'" >&2
1919
exit 1
2020
fi
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
#!/usr/bin/env bash
2+
13
cat << EOF
24
apiVersion: v1
35
kind: ConfigMap
46
metadata:
57
name: test-cm
68
data:
79
foo: bar
8-
EOF
10+
EOF

test/sc-orig.log

Whitespace-only changes.

ui/scripts/build_docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -e
44

55
TAG=${IMAGE_TAG:-'latest'}
66

7-
docker build --build-arg ARGO_VERSION=${TAG} -t ${IMAGE_NAMESPACE:-`whoami`}/argocd-ui:${TAG} .
7+
docker build --build-arg ARGO_VERSION=${TAG} -t ${IMAGE_NAMESPACE:-$(whoami)}/argocd-ui:${TAG} .
88

99
if [ "$DOCKER_PUSH" == "true" ]
1010
then
11-
docker push ${IMAGE_NAMESPACE:-`whoami`}/argocd-ui:${TAG}
11+
docker push ${IMAGE_NAMESPACE:-$(whoami)}/argocd-ui:${TAG}
1212
fi
+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
echo hello world
1+
#!/usr/bin/env bash
2+
3+
echo hello world

0 commit comments

Comments
 (0)