Merge pull request #119 from git-for-windows/fix-breaking-the-pacman-lease

Fix breaking the Pacman lease

Author: dscho

.github/workflows/break-pacman-upload-lease.yml

@@ -1,36 +1,22 @@
-name: break-pacman-upload-lease
-run-name: Break pacman upload lease
+name: Break Pacman Upload Lease
 
 on:
   workflow_dispatch:
 
 jobs:
   break-lease:
-    if: github.event.repository.owner.login == 'git-for-windows'
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - name: Clone build-extra
-        shell: bash
-        run: git clone --depth 1 --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra
-
-      - name: Prepare home directory
-        if: env.AZURE_BLOBS_TOKEN != ''
-        env:
-          AZURE_BLOBS_TOKEN: ${{secrets.AZURE_BLOBS_TOKEN}}
-        shell: bash
-        run: |
-          echo "::add-mask::$(echo "$AZURE_BLOBS_TOKEN" | base64 -w 0)" &&
-          echo "$AZURE_BLOBS_TOKEN" >"$HOME"/.azure-blobs-token
-
+        uses: actions/checkout@v4
+        with:
+          repository: git-for-windows/build-extra
       - name: Break the lease
-        if: env.AZURE_BLOBS_TOKEN != ''
+        if: env.azure_blobs_token != ''
         shell: bash
         env:
-          AZURE_BLOBS_TOKEN: ${{secrets.AZURE_BLOBS_TOKEN}}
-        run: /usr/src/build-extra/pacman-helper.sh break_lock
-
-      - name: Clean up temporary files
-        if: always()
-        shell: bash
+          azure_blobs_token: ${{secrets.AZURE_BLOBS_TOKEN}}
         run: |
-          { rm -rf "$HOME" || echo "Gracefully leaving files undeleted" >&2; }
+          echo "::add-mask::$(echo "$AZURE_BLOBS_TOKEN" | base64 -w 0)" &&
+          ./pacman-helper.sh break_lock