diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c60f966723..73a64bbe7d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -165,6 +165,36 @@ jobs: runs-on: windows-latest steps: + - name: Upgrade Git for Windows to latest (pre)release + # This upgrades Git to work around https://github.com/GitoxideLabs/gitoxide/issues/1849. + # TODO: Remove this step once the runner image has Git 2.49.0 or higher. + env: + GH_TOKEN: ${{ github.token }} + run: | + $workingDir = '~/git-dl' + $repo = 'git-for-windows/git' + $pattern = 'Git-*-64-bit.exe' + $log = 'setup-log.txt' + # Inno Setup args reference: https://jrsoftware.org/ishelp/index.php?topic=setupcmdline + $arguments = @( + '/VERYSILENT', + '/SUPPRESSMSGBOXES', + '/ALLUSERS', + "/LOG=$log", + '/NORESTART', + '/CLOSEAPPLICATIONS', + '/FORCECLOSEAPPLICATIONS' + ) + + mkdir $workingDir | Out-Null + cd $workingDir + $newestTag = gh release list --repo $repo --limit 1 --json tagName --jq '.[0].tagName' + gh release download $newestTag --repo $repo --pattern $pattern + $installer = Get-Item $pattern + Start-Process -FilePath $installer -ArgumentList $arguments -NoNewWindow -Wait + + Get-Content -Path $log -Tail 50 + git version - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 diff --git a/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt b/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt index 7f9f3bef3a3..945b94e97b2 100644 --- a/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt +++ b/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt @@ -1,7 +1,4 @@ -gix-diff-tests::diff index::renames_by_identity -gix-diff-tests::diff tree_with_rewrites::renames_by_identity gix-glob::glob pattern::matching::compare_baseline_with_ours -gix-merge::merge tree::run_baseline gix-pathspec::pathspec parse::baseline gix-pathspec::pathspec parse::valid::glob_negations_are_always_literal gix-pathspec::pathspec parse::valid::whitespace_in_pathspec