chore: make sure to use version instead of effective version

otherwise the components in the CTF will still be flagged as dev if used from the release flow
open-component-model · Nov 22, 2024 · e5693dd · e5693dd
1 parent f80584b
commit e5693dd
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 65 deletions.
diff --git a/.github/workflows/components.yaml b/.github/workflows/components.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
   workflow_call:
     inputs:
-      effective-version:
+      version:
         type: string
         required: false
         description: "The version to use for the build"
@@ -92,7 +92,7 @@ jobs:
           
           PATH=$PATH:$(go env GOPATH)/bin \
           CTF_TYPE=${{ env.CTF_TYPE }} \
-          EFFECTIVE_VERSION=${{ inputs.effective-version }} \
+          VERSION=${{ inputs.version }} \
           PLATFORMS="${{ env.PLATFORMS }}" \
           IMAGE_PLATFORMS="${{ env.IMAGE_PLATFORMS }}" \
           make \

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -83,7 +83,7 @@ jobs:
     uses: ./.github/workflows/components.yaml
     needs: [ check,release-version ]
     with:
-      effective-version: ${{ needs.release-version.outputs.version_no_prefix }}
+      version: ${{ needs.release-version.outputs.version_no_prefix }}
       upload-ctf: true
       ref: ${{ github.ref }}
     permissions:
@@ -172,27 +172,6 @@ jobs:
           git config user.name "GitHub Actions Bot"
           git config user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
 
-      - name: Update Release Notes File
-        env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-        run: |
-          if git ls-remote --exit-code origin refs/tags/${{ env.RELEASE_VERSION }}; then
-            >&2 echo "tag ${{ env.RELEASE_VERSION }} already exists"
-            exit 2
-          fi
-          v="${{env.RELEASE_VERSION}}"
-          f="docs/releasenotes/$v.md"
-          if [ ! -f "$f" ]; then
-            echo "# Release ${{ env.RELEASE_VERSION }}" > "$f"
-            echo "$RELEASE_NOTES" | tail -n +2 >> "$f"
-            git add "$f"
-            git commit -m "ReleaseNotes for $RELEASE_VERSION"
-            git push origin ${GITHUB_REF#refs/heads/}
-          else
-            echo "Using release notes file $f from code base"
-          fi
-          echo "RELEASE_NOTES_FILE=$f" >> $GITHUB_ENV
-
       - name: Create and Push Release
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
@@ -211,12 +190,17 @@ jobs:
           echo "${{ secrets.GPG_PRIVATE_KEY_FOR_SIGNING }}" > ocm-releases-key.gpg
           echo "GPG_KEY_PATH=ocm-releases-key.gpg" >> $GITHUB_ENV
 
+      - name: Setup Release Notes as File to make it readable by GoReleaser
+        run: |
+          echo "${{ fromJSON(needs.check.outputs.draft-release-notes).body }}" > $RUNNER_TEMP/RELEASE_NOTES.md
+          echo "RELEASE_NOTES=$RUNNER_TEMP/RELEASE_NOTES.md" >> $GITHUB_ENV
+          cat $RUNNER_TEMP/RELEASE_NOTES.md
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: 2.1.0
-          args: release --clean --timeout 60m --skip=validate --config=.github/config/goreleaser.yaml --release-notes=${{ env.RELEASE_NOTES_FILE }}
+          args: release --clean --timeout 60m --skip=validate --config=.github/config/goreleaser.yaml --release-notes=${{ env.RELEASE_NOTES }}
         env:
           GITHUBORG: ${{ github.repository_owner }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -253,38 +237,6 @@ jobs:
           event-type: publish-ocm-cli
           client-payload: '{"version":"${{ env.RELEASE_VERSION }}","push-to-aur":true,"push-to-chocolatey":true,"push-to-winget":true}'
 
-  merge-back-release-into-release-branch-history:
-    needs: release
-    runs-on: ubuntu-latest
-    name: Write an empty Commit into the release branch with the tag
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-          # fetch the tags so we can use it in our merge command
-          fetch-tags: true
-          token: ${{ steps.generate_token.outputs.token }}
-      - name: Setup git config
-        run: |
-          git config user.name "GitHub Actions Bot"
-          git config user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
-      # merge the tag back into the release branch
-      # this is necessary to make sure that the release branch contains the tag
-      # and the tag is not "dangling" in the history
-      - name: Merge back Release Tag into history
-        env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-        run: |
-          git checkout ${{ github.ref }}
-          git merge \
-            --no-ff \
-            --no-edit \
-            --message "Release ${{ env.RELEASE_VERSION }}" \
-            --strategy ours \
-            refs/tags/${{ env.RELEASE_VERSION }}
-          git push origin ${{ github.ref }}
-
   # make sure that the branch contains the next valid patch
   bump-release-branch-pr:
     if: inputs.release_candidate == false

diff --git a/components/demoplugin/Makefile b/components/demoplugin/Makefile
@@ -7,7 +7,9 @@ PLATFORMS ?= linux/amd64 linux/arm64
 CTF_TYPE ?= directory
 
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION                                        = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+ifeq ($(VERSION),)
+VERSION                                        := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+endif
 COMMIT                                         = $(shell git rev-parse --verify HEAD)
 # if EFFECTIVE_VERSION is not set, set it to VERSION+COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string

diff --git a/components/ecrplugin/Makefile b/components/ecrplugin/Makefile
@@ -8,7 +8,9 @@ CTF_TYPE ?= directory
 
 
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION                                        = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+ifeq ($(VERSION),)
+VERSION                                        := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+endif
 COMMIT                                         = $(shell git rev-parse --verify HEAD)
 # if EFFECTIVE_VERSION is not set, set it to VERSION+COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string

diff --git a/components/helmdemo/Makefile b/components/helmdemo/Makefile
@@ -8,9 +8,11 @@ CTF_TYPE ?= directory
 HELMINSTCOMP = $(PROVIDER)/toi/installers/helminstaller
 
 REPO_ROOT                                     := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION                                        = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+ifeq ($(VERSION),)
+VERSION                                        := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+endif
 COMMIT                                         = $(shell git rev-parse --verify HEAD)
-# if EFFECTIVE_VERSION is not set, set it to VERSION-COMMIT
+# if EFFECTIVE_VERSION is not set, VERSION+COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string
 ifeq ($(EFFECTIVE_VERSION),)
 EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)

diff --git a/components/helminstaller/Makefile b/components/helminstaller/Makefile
@@ -9,9 +9,11 @@ IMAGE_PLATFORMS ?= linux/amd64 linux/arm64
 CTF_TYPE ?= directory
 
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
+ifeq ($(VERSION),)
 VERSION                                        := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+endif
 COMMIT                                         := $(shell git rev-parse --verify HEAD)
-# if EFFECTIVE_VERSION is not set, set it to VERSION-COMMIT
+# if EFFECTIVE_VERSION is not set, VERSION+COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string
 ifeq ($(EFFECTIVE_VERSION),)
 EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)

diff --git a/components/ocmcli/Makefile b/components/ocmcli/Makefile
@@ -12,7 +12,9 @@ CTF_TYPE ?= directory
 
 REPO_ROOT                                      := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../..
 GIT_TREE_STATE                                 = $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
-VERSION                                        = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+ifeq ($(VERSION),)
+VERSION                                        := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+endif
 COMMIT                                         = $(shell git rev-parse --verify HEAD)
 # if EFFECTIVE_VERSION is not set, set it to VERSION+COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string

diff --git a/components/subchartsdemo/Makefile b/components/subchartsdemo/Makefile
@@ -13,9 +13,11 @@ PODINFO_CHART_VERSION = 6.3.5
 
 REPO_ROOT                                     := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
 GIT_TREE_STATE                                 = $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
-VERSION                                        = $(shell go run $(REPO_ROOT)/api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+ifeq ($(VERSION),)
+VERSION                                        := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+endif
 COMMIT                                         = $(shell git rev-parse --verify HEAD)
-# if EFFECTIVE_VERSION is not set, set it to VERSION-COMMIT
+# if EFFECTIVE_VERSION is not set, VERSION+COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string
 ifeq ($(EFFECTIVE_VERSION),)
 EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)