revert previous change and set version manually for non-main PR case

Author: adwk67

.github/workflows/build.yml

@@ -345,14 +345,29 @@ jobs:
         with:
           crate: cargo-edit
           bin: cargo-set-version
+      - name: Update version if PR against main branch
+        if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
+        run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
+      - name: Update version if PR against non-main branch
+        # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
+        # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
+        # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
+        if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
+          PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
+          sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml
+
       # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
       # default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
       # This is needed for the HELM_REPO variable.
       - name: Install cosign
         uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
       - name: Install syft
         uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2
-      - name: Build prerequisites
+      - name: Build Docker image and Helm chart
         run: |
           # Installing helm and yq on ubicloud-standard-8-arm only
           if [ "$(arch)" = "aarch64" ]; then
@@ -362,29 +377,8 @@ jobs:
             sudo apt-get -y install helm
             sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
           fi
-      - name: Build Docker image and Helm chart - main-PR
-        if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          PR_VERSION="0.0.0-pr${PR_NUMBER}"
-
-          make -e build PR_VERSION="$PR_VERSION"
-      - name: Build Docker image and Helm chart - non-main-PR
-        if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
-          PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
-
-          make -e build PR_VERSION="$PR_VERSION"
-      - name: Build Docker image and Helm chart - non-PR
-        if: ${{ github.event_name != 'pull_request' }}
-        run: |
-          PR_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
 
-          make -e build PR_VERSION="$PR_VERSION"
+          make -e build
       - name: Publish Docker image and Helm chart
         if: ${{ !github.event.pull_request.head.repo.fork }}
         run: |

Makefile

@@ -142,7 +142,7 @@ helm-publish:
 	cosign sign -y "${OCI_REGISTRY_HOSTNAME}/${OCI_REGISTRY_PROJECT_CHARTS}/${HELM_CHART_NAME}@$$REPO_DIGEST_OF_ARTIFACT"
 
 helm-package:
-	mkdir -p target/helm && helm package --version ${PR_VERSION} --destination target/helm deploy/helm/${OPERATOR_NAME}
+	mkdir -p target/helm && helm package --destination target/helm deploy/helm/${OPERATOR_NAME}
 
 ## Chart related targets
 compile-chart: version crds config