From 4022faad7e8d0f0fd3701bac04f42372af22ba59 Mon Sep 17 00:00:00 2001 From: daz Date: Fri, 28 Jun 2024 13:21:54 -0600 Subject: [PATCH] Fix integ-test-cache-cleanup.yml for running on act --- .github/workflows/integ-test-cache-cleanup.yml | 12 +++++++++--- CONTRIBUTING.md | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integ-test-cache-cleanup.yml b/.github/workflows/integ-test-cache-cleanup.yml index c6d44054..060547d1 100644 --- a/.github/workflows/integ-test-cache-cleanup.yml +++ b/.github/workflows/integ-test-cache-cleanup.yml @@ -35,7 +35,7 @@ jobs: cache-read-only: false # For testing, allow writing cache entries on non-default branches - name: Build with 3.1 working-directory: sources/test/jest/resources/cache-cleanup - run: gradle --no-daemon --build-cache -Dcommons_math3_version="3.1" build + run: ./gradlew --no-daemon --build-cache -Dcommons_math3_version="3.1" build # Second build will use the cache from the first build, but cleanup should remove unused artifacts assemble-build: @@ -58,7 +58,7 @@ jobs: gradle-home-cache-cleanup: true - name: Build with 3.1.1 working-directory: sources/test/jest/resources/cache-cleanup - run: gradle --no-daemon --build-cache -Dcommons_math3_version="3.1.1" build + run: ./gradlew --no-daemon --build-cache -Dcommons_math3_version="3.1.1" build check-clean-cache: needs: assemble-build @@ -78,7 +78,9 @@ jobs: with: cache-read-only: true - name: Report Gradle User Home - run: du -hc ~/.gradle/caches/modules-2 + run: | + du -hc ~/.gradle/caches/modules-2 + du -hc ~/.gradle/wrapper/dists - name: Verify cleaned cache shell: bash run: | @@ -90,3 +92,7 @@ jobs: echo "::error ::Should NOT find commons-math3 3.1 in cache" exit 1 fi + if [ ! -e ~/.gradle/wrapper/dists/gradle-8.0.2-bin ]; then + echo "::error ::Should find gradle-8.0.2 in wrapper/dists" + exit 1 + fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c3313d1..2fed3d08 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,6 @@ Example running a single job: `./build act -W .github/workflows/integ-test-caching-config.yml -j cache-disabled-pre-existing-gradle-home` Known issues: -- `integ-test-cache-cleanup.yml` fails because `gradle` is not installed on the runner. Should be fixed by #33. - `integ-test-detect-java-toolchains.yml` fails when running on a `linux/amd64` container, since the expected pre-installed JDKs are not present. Should be fixed by #89. - `act` is not yet compatible with `actions/upload-artifact@v4` (or related toolkit functions) - See https://github.com/nektos/act/pull/2224