Skip to content

Commit d4cb38c

Browse files
authored
Add changes to fix tag change CI jobs (#199)
1 parent 5137a48 commit d4cb38c

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ jobs:
2525

2626
- name: Check Tag Change
2727
id: changetag
28-
shell: bash
2928
run: |
3029
output=$(./build/self-signer-utility.sh)
31-
echo $output | grep "You have not changed the tag of selfSigner utility"
32-
if [[ $? -ne 0 ]]; then
30+
echo $output | grep "You have changed the tag of selfSigner utility"
31+
if [[ $? -eq 0 ]]; then
3332
echo ::set-output name=tagChange::true
3433
fi
3534

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ jobs:
110110
run: make install-yq
111111

112112
- name: Verify tag change
113+
id: changetag
113114
run: |
114-
./build/self-signer-utility.sh
115-
if [[ $? -ne 0 ]]; then
116-
exit 1
117-
fi
115+
output=$(./build/self-signer-utility.sh)
116+
echo $output | grep "You have changed the tag of selfSigner utility"
117+
exit $?
118118
119119
# pre job to run helm e2e tests
120120
helm-install-e2e:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ kubectl delete pods -l app.kubernetes.io/component=cockroachdb
184184
```
185185

186186
This will delete all the cockroachdb pods and restart the cluster with new certificates generated by the self-signer utility.
187-
The migration will have some downtime as all the pods are upgraded at the same time instead of rolling update.
187+
The migration will have some downtime as all the pods are upgraded at the same time instead of rolling update.

build/self-signer-utility.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ currentCommit=$(git rev-parse HEAD)
66
lastCommit=$(git rev-parse @~)
77

88
git diff "${lastCommit}" "${currentCommit}" cockroachdb/values.yaml | grep -w "$tag" | grep +
9-
if [[ $? -ne 0 ]]; then
10-
echo "You have not changed the tag of selfSigner utility"
9+
if [[ $? -eq 0 ]]; then
10+
echo "You have changed the tag of selfSigner utility"
1111
fi

cockroachdb/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ tls:
485485
# Image Placeholder for the selfSigner utility. This will be changed once the CI workflows for the image is in place.
486486
image:
487487
repository: cockroachlabs-helm-charts/cockroach-self-signer-cert
488-
tag: "1.2"
488+
tag: "1.3"
489489
pullPolicy: IfNotPresent
490490
credentials: {}
491491
registry: gcr.io

0 commit comments

Comments
 (0)