From 89279012228defa8439d49d6a11bf85f9f153ecb Mon Sep 17 00:00:00 2001 From: Christopher Sasarak Date: Thu, 29 Aug 2024 13:10:46 -0500 Subject: [PATCH] Try adding an additional rust-cache directory. --- .github/workflows/build-all.yml | 5 +++++ .github/workflows/scripts/build.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index ec3fee602b..d201b5450e 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -72,9 +72,14 @@ jobs: # Set up Rust, this is mainly used for rust-cache. # This action installs the 'minimal' profile. + # Even on Linux ARM this is necessary because rust-cache uses it. - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 + with: + # This additional directory is because the home directory inside containers + # is different than the one outside of it. + cache-directories: ${{ runner.temp }}/_github_home/.cargo - name: Debugging information run: | diff --git a/.github/workflows/scripts/build.sh b/.github/workflows/scripts/build.sh index 73caa6416d..bb160c5f0e 100755 --- a/.github/workflows/scripts/build.sh +++ b/.github/workflows/scripts/build.sh @@ -27,8 +27,8 @@ git config --global --add safe.directory "$GITHUB_WORKSPACE" # During the tag build, cabal/GHC may not realize that they have to rebuild the Version.hs file because the tag is invisible to it. # This line adds a comment to our version source file to prompt cabal/GHC to rebuild Version.hs. echo "{- $GITHUB_RUN_ID -}" >> src/App/Version.hs -cabal update --verbose -cabal build --verbose --project-file="$PROJECT_FILE" all +cabal update +cabal build --project-file="$PROJECT_FILE" all cabal test --project-file="$PROJECT_FILE" unit-tests # TODO: Bring this back.