Modify workflow to ensure VERSION is correct (#1131)

Signed-off-by: Michal Pryc <[email protected]>
dora-metrics · Apr 22, 2024 · 95d900d · 95d900d
1 parent 778192f
commit 95d900d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -47,7 +47,7 @@ jobs:
             else
               echo "tags=$(echo stable,latest,${{ github.sha }},v$CURRENT_CHART_VERSION)" >> "$GITHUB_OUTPUT"
               echo is_release=true >> "$GITHUB_OUTPUT"
-              export CURRENT_OPERATOR_VERSION="$(grep "VERSION ?= " pelorus-operator/Makefile  | cut -c 12-)"
+              export CURRENT_OPERATOR_VERSION="$(grep "^VERSION ?= " pelorus-operator/Makefile  | cut -c 12-)"
               echo version=$CURRENT_OPERATOR_VERSION >> "$GITHUB_OUTPUT"
             fi
           else

diff --git a/.github/workflows/test-images.yml b/.github/workflows/test-images.yml
@@ -78,7 +78,7 @@ jobs:
           TEST_VERSION: pr${{ needs.setup.outputs.pr_number }}-${{ needs.setup.outputs.commit_hash }}
         working-directory: ./pelorus-operator
         run: |
-          export CURRENT_OPERATOR_VERSION="$(grep "VERSION ?= " Makefile  | cut -c 12-)"
+          export CURRENT_OPERATOR_VERSION="$(grep "^VERSION ?= " Makefile  | cut -c 12-)"
           export CURRENT_CHART_VERSION="$(grep '^version: ' helm-charts/pelorus/Chart.yaml  | cut -c 10-)"
           export DEFAULT_OPERATOR_IMAGE="${{ env.REPOSITORY }}/pelorus-operator:$CURRENT_OPERATOR_VERSION"
           export TEST_OPERATOR_IMAGE="${{ env.REPOSITORY }}/rc-pelorus-operator:${{ env.TEST_VERSION }}"