Skip to content

Commit

Permalink
fix(tests): don't run test_amend_undo on Windows
Browse files Browse the repository at this point in the history
This test is failing with a missing event on Windows CI: https://github.com/arxanas/git-branchless/actions/runs/11253257799/job/31288816874?pr=1396

Historically, this is just due to unimportant changes in Git versions. We don't build and test against a fixed version of Git in GitHub Windows CI, so it's not unexpected that the correct output might have changed. I'd rather just skip this test than try to fix it in Windows.
  • Loading branch information
arxanas committed Oct 9, 2024
1 parent d650e43 commit c81e7a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
run: |
$env:TEST_GIT='C:\Program Files\Git\cmd\git.exe'
$env:TEST_GIT_EXEC_PATH='C:\Program Files\Git\cmd'
cargo test --examples --tests --workspace
cargo test --examples --tests --workspace --no-fail-fast
1 change: 1 addition & 0 deletions git-branchless/tests/test_amend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ fn test_amend_unresolved_merge_conflict() -> eyre::Result<()> {
}

#[test]
#[cfg(unix)] // NOTE(arxanas, 2024-10-09): output depends on specific Git version, which seems to have changed recently on GitHub Windows CI
fn test_amend_undo() -> eyre::Result<()> {
let git = make_git()?;

Expand Down

0 comments on commit c81e7a1

Please sign in to comment.