Merge pull request #61 from dscho/use-update-via-pacman.ps1

build-and-deploy: use `update-via-pacman.ps1` instead of a home-grown `pacman -Syyu`
git-for-windows · Dec 22, 2023 · 93221c6 · 93221c6
2 parents 476bb19 + 41a8908
commit 93221c6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -98,6 +98,7 @@ jobs:
 
       - name: Download Git for Windows SDK
         uses: git-for-windows/setup-git-for-windows-sdk@v1
+        id: setup-sdk
         with:
           flavor: ${{ env.PACKAGE_TO_BUILD == 'mingw-w64-git' && 'build-installers' || 'full' }}
           architecture: ${{ env.ARCHITECTURE || 'x86_64' }}
@@ -122,9 +123,10 @@ jobs:
         shell: bash
         run: git clone --depth 1 --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra
 
-      - name: pacman -Syyu
-        shell: bash
-        run: pacman -Syyu --noconfirm
+      - name: update the SDK ("pacman -Syyu")
+        shell: powershell
+        run: |
+          & ("${{ steps.setup-sdk.outputs.result }}\update-via-pacman.ps1")
 
       - name: rebase `.dll` base addresses
         if: env.ARCHITECTURE == 'i686'