ci: for WOA, split up git install from the rest so checks can run sooner.

Author: lilith

.github/actions/setup-git-win-arm64/action.yml

@@ -0,0 +1,36 @@
+name: 'Setup Git for Windows ARM64'
+description: 'Set up Git for Windows ARM64 environment with necessary tools'
+# maybe switch to winget someday?
+# Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe
+runs:
+  using: "composite"
+  steps:
+
+    - name: Check if Git is installed, returning step variable
+      shell: powershell
+      id: git-installed
+      run: |
+        if (Test-Path "C:\Program Files\Git\bin\git.exe") {
+          Write-Host "Git is already installed"
+          echo "::set-output name=git-installed::true"
+        } else {
+          Write-Host "Git is not installed"
+          echo "::set-output name=git-installed::false"
+        }
+
+
+    - name: Install Git
+      shell: powershell
+      run: |
+        $url = "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.2/Git-2.47.1.2-arm64.exe"
+        Invoke-WebRequest -Uri $url -OutFile git-installer.exe
+        Start-Process -FilePath .\git-installer.exe -ArgumentList "/VERYSILENT", "/NORESTART" -Wait
+      if: steps.git-installed.outputs.git-installed == 'false'
+
+
+    - name: Add Git and GNU tools (required for actions/cache to work (tar is needed)) to PATH
+      shell: powershell
+      run: |
+        echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+

.github/actions/setup-win-arm64/action.yml

@@ -5,18 +5,6 @@ description: 'Set up Windows ARM64 environment with necessary tools'
 runs:
   using: "composite"
   steps:
-
-    - name: Install Git (required for actions/cache to work (tar is needed))
-      shell: powershell
-      run: |
-        $url = "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.2/Git-2.47.1.2-arm64.exe"
-        Invoke-WebRequest -Uri $url -OutFile git-installer.exe
-        Start-Process -FilePath .\git-installer.exe -ArgumentList "/VERYSILENT", "/NORESTART" -Wait
-
-    - name: Use GNU tar from Git
-      shell: powershell
-      run:  echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
     # - name: Cache tools
     #   uses: actions/cache@v4
     #   id: cache-tools
@@ -26,6 +14,9 @@ runs:
     #       C:\Users\runneradmin\.cargo
     #     key: ${{ runner.os }}-arm64-tools-v3
 
+    - name: Setup Git
+      uses: ./.github/actions/setup-git-win-arm64
+
     - name: Install Visual Studio Build Tools (Preview)
       shell: powershell
       run: |
@@ -67,7 +58,6 @@ runs:
       run: |
         echo "Adding tools to PATH"
         echo "C:\BuildTools\Common7\Tools"  | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "C:\BuildTools\VC\Tools\MSVC\$msvc_ver\bin\Hostx64\arm64" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "C:\BuildTools\VC\Tools\MSVC\$msvc_ver\bin\Hostx64\x64" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "$env:USERPROFILE\.cargo\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

.github/workflows/ci.yml

@@ -141,9 +141,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: "WOA: Setup Windows ARM64"
-        uses: ./.github/actions/setup-win-arm64
+      - name: "WOA: Setup Git and GNU tools for Windows ARM64"
+        uses: ./.github/actions/setup-git-win-arm64
         if: matrix.woa == 'true'
+
       - name: "WOA: Checkout code again with git, so git commands work."
         uses: actions/checkout@v4
         if: matrix.woa == 'true'
@@ -157,6 +158,10 @@ jobs:
           key: ${{ matrix.name }}
         if: matrix.cross != 'true'
 
+      - name: "WOA: Install MSBUILD + Rust + Nasm + Git for Windows ARM64"
+        uses: ./.github/actions/setup-win-arm64
+        if: matrix.woa == 'true'
+
       - uses: dtolnay/rust-toolchain@stable
         if: matrix.cross != 'true' && matrix.woa != 'true'