fix: release build fixes (#35)

* fix: release build fixes I copied the release build from minikube when doing the bootc extension. We found a few small issues and made changes, so I am contributing them back. I've included all 4 changes since they are all small and on the same file, but I can split them up or remove some if requested. line 51/78: Set the git email to be the person that kicked off the release (remove fbenoit hardcoding). Using a bot would be better, but this works for now. line 87: Fixes the missing version in the description of the automated PR to bump version from e.g. "has been released." to "0.2.0 has been released." line 96: Change the bumped version back before doing the build so that the correct version is in the released extension. e.g. today the released extension would be correctly tagged 0.2.0 but once you install it the version from package.json will say 0.3.0 (the bumped version). lines 131-135: Publish the image as 'latest', so that the release build is also the latest. Fixes #32. Signed-off-by: Tim deBoer <[email protected]> * chore: remove latest from the CI job and use nightly instead Change-Id: I60e3814d4966dade5112e4e69267a1accb3dc213 Signed-off-by: Florent Benoit <[email protected]> * chore: fix date Change-Id: Ifb23b8e4375fd82cdcb1370bf32522fe4e2b0add Signed-off-by: Florent Benoit <[email protected]> --------- Signed-off-by: Tim deBoer <[email protected]> Signed-off-by: Florent Benoit <[email protected]> Co-authored-by: Florent Benoit <[email protected]>
podman-desktop · May 2, 2024 · 37864c6 · 37864c6
1 parent d51b1c8
commit 37864c6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/build-next.yaml b/.github/workflows/build-next.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2023 Red Hat, Inc.
+# Copyright (C) 2023-2024 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,9 +58,9 @@ jobs:
         id: publish-image
         run: |
           IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/podman-desktop-extension-minikube
-          IMAGE_LATEST=${IMAGE_NAME}:latest
+          IMAGE_NIGHTLY=${IMAGE_NAME}:nightly
           IMAGE_SHA=${IMAGE_NAME}:${GITHUB_SHA}
-          podman build -t $IMAGE_LATEST .
-          podman push $IMAGE_LATEST
-          podman tag $IMAGE_LATEST $IMAGE_SHA
+          podman build -t $IMAGE_NIGHTLY .
+          podman push $IMAGE_NIGHTLY
+          podman tag $IMAGE_NIGHTLY $IMAGE_SHA
           podman push $IMAGE_SHA
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2023 Red Hat, Inc.
+# Copyright (C) 2023-2024 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ jobs:
       - name: tag
         run: |
           git config --local user.name ${{ github.actor }}
+          git config --local user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
 
           # Add the new version in package.json file
           sed -i  "s#version\":\ \"\(.*\)\",#version\":\ \"${{ steps.TAG_UTIL.outputs.minikubeExtensionVersion }}\",#g" package.json
@@ -58,6 +59,7 @@ jobs:
           echo "Tagging with ${{ steps.TAG_UTIL.outputs.githubTag }}"
           git tag ${{ steps.TAG_UTIL.outputs.githubTag }}
           git push origin ${{ steps.TAG_UTIL.outputs.githubTag }}
+
       - name: Create Release
         id: create_release
         uses: ncipollo/release-action@v1
@@ -73,7 +75,7 @@ jobs:
         if: ${{ github.event.inputs.branch == 'main' }}
         run: |
           git config --local user.name ${{ github.actor }}
-          git config --local user.email "fbenoit@redhat.com"
+          git config --local user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
           CURRENT_VERSION=$(echo "${{ steps.TAG_UTIL.outputs.minikubeExtensionVersion }}")
           tmp=${CURRENT_VERSION%.*}
           minor=${tmp#*.}
@@ -84,13 +86,14 @@ jobs:
           git add package.json
           git commit -s --amend -m "chore: bump version to ${bumpedVersion}"
           git push origin "${bumpedBranchName}"
-          echo -e "📢 Bump version to ${bumpedVersion}\n\n${{ steps.TAG_UTIL.outputs.desktopVersion }} has been released.\n\n Time to switch to the new ${bumpedVersion} version 🥳" > /tmp/pr-title
+          echo -e "📢 Bump version to ${bumpedVersion}\n\n${{ steps.TAG_UTIL.outputs.minikubeExtensionVersion }} has been released.\n\n Time to switch to the new ${bumpedVersion} version 🥳" > /tmp/pr-title
           pullRequestUrl=$(gh pr create --title "chore: 📢 Bump version to ${bumpedVersion}" --body-file /tmp/pr-title --head "${bumpedBranchName}" --base "main")
           echo "📢 Pull request created: ${pullRequestUrl}"
           echo "➡️ Flag the PR as being ready for review"
           gh pr ready "${pullRequestUrl}"
           echo "🔅 Mark the PR as being ok to be merged automatically"
           gh pr merge "${pullRequestUrl}" --auto --rebase
+          sed -i  "s#version\":\ \"\(.*\)\",#version\":\ \"${CURRENT_VERSION}\",#g" package.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -125,5 +128,8 @@ jobs:
         run: |
           IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/podman-desktop-extension-minikube
           IMAGE_WITH_TAG=${IMAGE_NAME}:${{ steps.TAG_UTIL.outputs.minikubeExtensionVersion }}
+          IMAGE_LATEST=${IMAGE_NAME}:latest
           podman build -t $IMAGE_WITH_TAG .
           podman push $IMAGE_WITH_TAG
+          podman tag $IMAGE_WITH_TAG $IMAGE_LATEST
+          podman push $IMAGE_LATEST