.github/workflows/release-operator.yaml

@@ -16,15 +16,23 @@ jobs:
     steps:
       - name: Checkout code at git ref
         uses: actions/checkout@v4
-      - name: Set envoironment variables
+      - name: Set environment variables
+        id: set_env_variables
         run: |
           bash ./utils/release/load_github_envvar.sh
+      - name: Create tag
+        id: create_tag
+        run: |
+          tag_name="${{ env.kuadratantOperatorTag }}"
+          git tag $tag_name
+          git push origin $tag_name
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        id: create_release
+        uses: softprops/action-gh-release@v2
         with:
-          name: v${{ env.kuadrantOperatorVersion }}
-          tag_name: v${{ env.kuadrantOperatorVersion }}
+          name: ${{ env.kuadratantOperatorTag }}
+          tag_name: ${{ env.kuadratantOperatorTag }}
           body: "${{ env.releaseBody }}"
           generate_release_notes: true
-          target_commitish: release-v${{ env.kuadrantOperatorVersion }}
+          target_commitish: ${{ env.releaseBranch }}
           prerelease: ${{ env.prerelease }}

make/verify.mk

@@ -32,7 +32,10 @@ verify-helm-charts: helm-build ## Verify helm charts update.
 	[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./charts)" ]
 
 .PHONY: verify-manifests ## Verify controller-gen, bundle and helm charts manifests.
-verify-manifests: verify-controller-manifests verify-bundle verify-helm-charts ## Verify manifests update.
+verify-manifests: ## Verify manifests update.
+	make verify-controller-manifests
+	make verify-bundle
+	make verify-helm-charts
 
 .PHONY: verify-prepare-release ## Verify set of manifests based on release.yaml file.
 verify-prepare-release: prepare-release

utils/release/load_github_envvar.sh

@@ -40,21 +40,24 @@ wasmShimVersion=$(yq '.dependencies.wasm-shim' $ROOT/release.yaml)
 
 releaseBody="**This release enables installations of Authorino Operator v$authorinoOperatorVersion, Limitador Operator v$limitadorOperatorVersion, DNS Operator v$dnsOperatorVersion, WASM Shim v$wasmShimVersion and ConsolePlugin $consolePluginURL**"
 
-kuadrantOperatorVersion=$(yq '.kuadrant-operator.version' $ROOT/release.yaml)
+kuadratantOperatorTag="v$(yq '.kuadrant-operator.version' $ROOT/release.yaml)"
+releaseBranch="release-$(echo "$kuadratantOperatorTag" | sed -E 's/^(v[0-9]+\.[0-9]+).*/\1/')"
 
 prerelease=false
-if [[ "$kuadrantOperatorVersion" == *"-"* ]]; then
+if [[ "$kuadratantOperatorTag" =~ [-+] ]]; then
 	prerelease=true
 fi
 
 if [[ $_log == "1" ]]; then
-	log $kuadrantOperatorVersion
-	log "$releaseBody"
-	log $prerelease
+	log "kuadratantOperatorTag=$kuadratantOperatorTag"
+	log "releaseBody=$releaseBody"
+	log "prerelease=$prerelease"
+	log "releaseBranch=$releaseBranch"
 fi
 
 if [[ $dry_run == "0" ]]; then
-	echo "kuadrantOperatorVersion=$kuadrantOperatorVersion" >> "$GITHUB_ENV"
+	echo "kuadratantOperatorTag=$kuadratantOperatorTag" >> "$GITHUB_ENV"
 	echo "releaseBody=$releaseBody" >> "$GITHUB_ENV"
 	echo "prerelease=$prerelease" >> "$GITHUB_ENV"
+	echo "releaseBranch=$releaseBranch" >> "$GITHUB_ENV"
 fi