Merge pull request #327 from inteon/use_self_upgrade_bugfix

Upgrade self-upgrade

.github/workflows/make-self-upgrade.yaml

@@ -29,7 +29,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ steps.go-version.outputs.result }}
 
@@ -56,7 +56,7 @@ jobs:
         run: |
           git config --global user.name "jetstack-bot"
           git config --global user.email "[email protected]"
-          git commit -a -m "BOT: run 'make upgrade-klone' and 'make generate'"
+          git commit -a -m "BOT: run 'make upgrade-klone' and 'make generate'" --signoff
           git push -f origin self-upgrade
 
       - if: ${{ steps.is-up-to-date.outputs.result != 'true' }}

klone.yaml

@@ -57,13 +57,13 @@ targets:
       repo_ref: main
       repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/oci-image
-    - folder_name: repository-base
-      repo_url: https://github.com/cert-manager/makefile-modules.git
-      repo_ref: main
-      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
-      repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
       repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/tools
+    - folder_name: repository-base
+      repo_url: https://github.com/cert-manager/makefile-modules.git
+      repo_ref: main
+      repo_hash: 9ccba62c3329f1fc95f661af4f2751513bf7baf7
+      repo_path: modules/repository-base

make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml

@@ -29,7 +29,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ steps.go-version.outputs.result }}
 
@@ -56,7 +56,7 @@ jobs:
         run: |
           git config --global user.name "jetstack-bot"
           git config --global user.email "[email protected]"
-          git commit -a -m "BOT: run 'make upgrade-klone' and 'make generate'"
+          git commit -a -m "BOT: run 'make upgrade-klone' and 'make generate'" --signoff
           git push -f origin self-upgrade
 
       - if: ${{ steps.is-up-to-date.outputs.result != 'true' }}