Helm chart job fixes (#2406)

Co-authored-by: Bevan Arps <bevan.arps@microsoft.com>
Azure · Jul 20, 2022 · 1b8a3eb · 1b8a3eb
1 parent d3069be
commit 1b8a3eb
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.github/workflows/helm-chart-repo.yaml b/.github/workflows/helm-chart-repo.yaml
@@ -13,7 +13,7 @@ on:
       - v2*
 
 env:
-  ref: "${{ github.ref_name || github.event.inputs.ref }}"
+  ref: "${{ github.event.inputs.ref || github.ref_name }}"
 
 jobs:
   generate:
@@ -26,12 +26,17 @@ jobs:
           fetch-depth: 0 # required to access tags
           submodules: 'true'
 
+      - name: Get SHA
+        run: |
+          echo "sha=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
       - name: Create Branch
-        uses: peterjgrainger/action-create-branch@b48b0ca0e307c9b56f059b70274984ffeaa90a43 # Pinned to v2.0.1
+        uses: peterjgrainger/action-create-branch@c2800a3a9edbba2218da6861fa46496cf8f3195a # Pinned to 2.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           branch: ${{ format('bot/update-helm-chart-{0}', env.ref) }}
+          sha: ${{ env.sha }}
 
       - name: Checkout code
         uses: actions/checkout@v3