Update build32.yml

use new output of msys2-location from setup-msys2
jeremyd2019 · Sep 3, 2024 · c338caf · c338caf
1 parent 9ef5444
commit c338caf
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/.github/workflows/build32.yml b/.github/workflows/build32.yml
@@ -53,18 +53,14 @@ jobs:
           ref: ${{ github.event.inputs.ref }}
           path: r
 
-      - uses: jeremyd2019/setup-msys2@v2_32
+      - id: msys2
+        uses: jeremyd2019/setup-msys2@v2_32
         with:
           msystem: MSYS
           install: git base-devel msys2-devel pactoys-git
           update: true
           bitness: 32
 
-      - name: Query MSYS2 root dir
-        id: msys2
-        shell: powershell
-        run: Write-Output ('rootdir={0}' -f (msys2 -c 'cygpath -w /')) >> $Env:GITHUB_OUTPUT
-
       - name: Add build32 repo
         if: ${{ github.event.inputs.release_name != 'repo' || github.event.inputs.repo_db_name != 'build32' }}
         continue-on-error: true
@@ -93,7 +89,7 @@ jobs:
       - name: Auto-Rebase 1
         shell: cmd
         run: |
-          call "${{ steps.msys2.outputs.rootdir }}\autorebase.bat"
+          call "${{ steps.msys2.outputs.msys2-location }}\autorebase.bat"
 
       - name: Update again
         run: ./update.sh
@@ -106,8 +102,8 @@ jobs:
       - name: Auto-Rebase 2 and subst
         shell: cmd
         run: |
-          del "${{ steps.msys2.outputs.rootdir }}\etc\rebase.db.*"
-          call "${{ steps.msys2.outputs.rootdir }}\autorebase.bat"
+          del "${{ steps.msys2.outputs.msys2-location }}\etc\rebase.db.*"
+          call "${{ steps.msys2.outputs.msys2-location }}\autorebase.bat"
           SUBST T: .
 
       - name: Build32