Fix release rancher and release charts GHA workflows (#575)

* Update default charts branch to dev-v2.11 * Fix branch switch * Fix webhook branch fetch
rancher · Dec 23, 2024 · d2d9625 · d2d9625
1 parent d368e16
commit d2d9625
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml
@@ -5,7 +5,7 @@ on:
       charts_ref:
         description: "Submit PR against the following rancher/charts branch (eg: dev-v2.10)"
         required: true
-        default: "dev-v2.10"
+        default: "dev-v2.11"
       prev_webhook:
         description: "Previous Webhook version (eg: v0.5.0-rc.13)"
         required: true
@@ -17,6 +17,7 @@ on:
 
 env:
   CHARTS_REF: ${{ github.event.inputs.charts_ref }}
+  WEBHOOK_REF: "${{ github.ref_name }}"
   PREV_WEBHOOK: ${{ github.event.inputs.prev_webhook }}
   NEW_WEBHOOK: ${{ github.event.inputs.new_webhook }}
 
@@ -30,7 +31,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.ref }}
+          ref: "${{ env.WEBHOOK_REF }}"
           path: webhook
 
       - uses: rancher-eio/read-vault-secrets@main
@@ -51,8 +52,8 @@ jobs:
       - name: Checkout charts repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           repository: ${{ github.repository_owner }}/charts
+          ref: "${{ env.CHARTS_REF }}"
           token: ${{ steps.app-token.outputs.token }}
           path: charts
           # Allow making git push request later on

diff --git a/.github/workflows/release-rancher.yaml b/.github/workflows/release-rancher.yaml
@@ -17,6 +17,7 @@ on:
 
 env:
   RANCHER_REF: ${{ github.event.inputs.rancher_ref }}
+  WEBHOOK_REF: "${{ github.ref_name }}"
   PREV_WEBHOOK: ${{ github.event.inputs.prev_webhook }}
   NEW_WEBHOOK: ${{ github.event.inputs.new_webhook }}
 
@@ -30,7 +31,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.ref }}
+          ref: "${{ env.WEBHOOK_REF }}"
           path: webhook
 
       - uses: rancher-eio/read-vault-secrets@main
@@ -51,8 +52,8 @@ jobs:
       - name: Checkout rancher repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           repository: ${{ github.repository_owner }}/rancher
+          ref: "${{ env.RANCHER_REF }}"
           token: ${{ steps.app-token.outputs.token }}
           path: rancher
           # Allow making git push request later on