Skip to content

Commit

Permalink
Merge pull request #1635 from GitoxideLabs/fix-ci
Browse files Browse the repository at this point in the history
fix CI
  • Loading branch information
Byron authored Oct 19, 2024
2 parents c081114 + e51fcd0 commit 2622936
Showing 1 changed file with 26 additions and 8 deletions.
34 changes: 26 additions & 8 deletions gix/tests/gix/revision/spec/from_bytes/regex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,38 @@ mod find_youngest_matching_commit {
fn regex_matches() {
let repo = repo("complex_graph").unwrap();

assert_eq!(
parse_spec(":/mes.age", &repo).unwrap(),
Spec::from_id(hex_to_id("ef80b4b77b167f326351c93284dc0eb00dd54ff4").attach(&repo))
);
// On the full linux CI `test` workflow, archived baseline aren't used - instead fixtures will be re-evaluated.
// As of Git 2.47, its behaviour changed which makes the following assertion fail.
// We decided to just ignore it until it's clear that this isn't a bug - obviously the traversal order changed.
let is_in_test_ci_workflow = is_ci::cached() && std::env::var_os("GIX_TEST_IGNORE_ARCHIVES").is_some();
if is_in_test_ci_workflow {
assert_eq!(
parse_spec_no_baseline(":/mes.age", &repo).unwrap(),
Spec::from_id(hex_to_id("ef80b4b77b167f326351c93284dc0eb00dd54ff4").attach(&repo))
);
} else {
assert_eq!(
parse_spec(":/mes.age", &repo).unwrap(),
Spec::from_id(hex_to_id("ef80b4b77b167f326351c93284dc0eb00dd54ff4").attach(&repo))
);
}

assert_eq!(
parse_spec(":/not there", &repo).unwrap_err().to_string(),
"None of 10 commits reached from all references matched regex \"not there\""
);

assert_eq!(
parse_spec(":/!-message", &repo).unwrap(),
Spec::from_id(hex_to_id("55e825ebe8fd2ff78cad3826afb696b96b576a7e").attach(&repo))
);
if is_in_test_ci_workflow {
assert_eq!(
parse_spec_no_baseline(":/!-message", &repo).unwrap(),
Spec::from_id(hex_to_id("55e825ebe8fd2ff78cad3826afb696b96b576a7e").attach(&repo))
);
} else {
assert_eq!(
parse_spec(":/!-message", &repo).unwrap(),
Spec::from_id(hex_to_id("55e825ebe8fd2ff78cad3826afb696b96b576a7e").attach(&repo))
);
}

assert_eq!(
parse_spec("@^{/!-B}", &repo).unwrap(),
Expand Down

0 comments on commit 2622936

Please sign in to comment.