From 65788e8e71b81c8a0e086b734ae3e73f45cbf8ba Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Mon, 16 Dec 2024 18:30:14 -0500 Subject: [PATCH 1/2] Revert "forcefully fix CI until it's clear what the problem is" This reverts commit 95664885d3a6f2e1fa4cb4b8a1ea9fd8e5abfc28. --- tests/journey/gix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/journey/gix.sh b/tests/journey/gix.sh index a7acfc8f70e..dd180cff8c7 100644 --- a/tests/journey/gix.sh +++ b/tests/journey/gix.sh @@ -109,7 +109,7 @@ title "gix (with repository)" # for some reason, on CI the daemon always shuts down before we can connect, # or isn't actually ready despite having accepted the first connection already. - (not_on_ci with "git:// protocol" + (with "git:// protocol" launch-git-daemon (with "version 1" it "generates the correct output" && { @@ -278,7 +278,7 @@ title "gix commit-graph" ) ) fi - (not_on_ci with "git:// protocol" + (with "git:// protocol" launch-git-daemon (with "version 1" (with "NO output directory" From bf2abdb41e22e27f599e845152b0b4643ec17235 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Mon, 16 Dec 2024 18:59:46 -0500 Subject: [PATCH 2/2] Try not caching journey test dependencies --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afc1cea684a..8da560b44fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 - uses: extractions/setup-just@v2 - name: Run journey tests run: just ci-journey-tests