fix windows workflow

jj-vcs · Jan 6, 2025 · 1e8cbe7 · 1e8cbe7
1 parent c48f919
commit 1e8cbe7
Showing 1 changed file with 23 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,11 +20,12 @@ jobs:
       fail-fast: false
       matrix:
         # macos-13 is x86; macos-14 is ARM
-        os: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        #os: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        os: [windows-latest]
         cargo_flags: [""]
-        include:
-        - os: ubuntu-latest
-          cargo_flags: "--all-features"
+        #include:
+        #- os: ubuntu-latest
+        #cargo_flags: "--all-features"
     runs-on: ${{ matrix.os }}
 
     # TODO FIXME (aseipp): keep the timeout limit to ~15 minutes. this is long
@@ -68,13 +69,30 @@ jobs:
         Remove-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
         choco install openssh --pre
 
+    # Make sure git is available in the path
+    - name: Setup git [windows]
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        echo "C:\Program Files\Git\cmd" >> $env:GITHUB_PATH
+        git --version
+
+
     - name: Install Rust
       uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203
       with:
         toolchain: 1.76
     - name: Build
       run: cargo build --workspace --all-targets --verbose ${{ matrix.cargo_flags }}
-    - name: Test
+    - name: Test (windows)
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        echo "C:\Program Files\Git\cmd" >> $env:PATH
+        echo "C:\Program Files\Git\cmd" >> $env:PATH
+        cargo test --workspace --all-targets --verbose ${{ matrix.cargo_flags }} test_git_clone
+      env:
+        RUST_BACKTRACE: 1
+    - name: Test (all but windows)
+      if: ${{ matrix.os != 'windows-latest' }}
       run: cargo test --workspace --all-targets --verbose ${{ matrix.cargo_flags }}
       env:
         RUST_BACKTRACE: 1