From 62141e19cfd881d82357cae2c7ed67475ac4109f Mon Sep 17 00:00:00 2001 From: sadath-12 Date: Mon, 8 Jan 2024 22:25:50 +0530 Subject: [PATCH 1/2] s Signed-off-by: sadath-12 --- .github/workflows/validate-crd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-crd.yaml b/.github/workflows/validate-crd.yaml index f4a0b531cf3..5a513f706fc 100644 --- a/.github/workflows/validate-crd.yaml +++ b/.github/workflows/validate-crd.yaml @@ -47,5 +47,5 @@ jobs: exit 1 fi - echo crd_changed=$crd_changed - echo version_changed=$version_changed + echo "crd_changed=$crd_changed" + echo "version_changed=$version_changed" From 58acf63b51238a93cb2d13cba90a80d6662d45bd Mon Sep 17 00:00:00 2001 From: sadath-12 Date: Mon, 8 Jan 2024 22:38:10 +0530 Subject: [PATCH 2/2] s Signed-off-by: sadath-12 --- .github/workflows/validate-crd.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validate-crd.yaml b/.github/workflows/validate-crd.yaml index 5a513f706fc..943cf9a259e 100644 --- a/.github/workflows/validate-crd.yaml +++ b/.github/workflows/validate-crd.yaml @@ -19,11 +19,12 @@ jobs: - name: Check for CRD changes and version update run: | - crd_changed=false - version_changed=false + + crd_changed=0 + version_changed=0 for changed_file in ${{ steps.changed-files.outputs.all }}; do if echo "$changed_file" | grep -q 'pkg/k8s/apis/cilium.io/client/crds/v1alpha1/'; then - crd_changed=true + crd_changed=1 fi if echo "$changed_file" | grep -q 'pkg/k8s/apis/cilium.io/v1alpha1/register.go'; then @@ -32,17 +33,17 @@ jobs: echo "old_version=$old_version" echo "new_version=$new_version" if [ "$old_version" != "$new_version" ]; then - version_changed=true + version_changed=1 fi fi done - if [ "$crd_changed" = true ] && [ "$version_changed" = false ]; then + if [ "$crd_changed" -eq 1 ] && [ "$version_changed" -eq 0 ]; then echo "CRD changed but version not updated" exit 1 fi - if [ "$crd_changed" = false ] && [ "$version_changed" = true ]; then + if [ "$crd_changed" -eq 0 ] && [ "$version_changed" -eq 1 ]; then echo "Version updated but CRD not changed" exit 1 fi