From ea435756f13b65b652b5e9e4d9850f3bdefb56f3 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 16 Sep 2026 07:06:58 +0000 Subject: [PATCH 1/2] Harden buildAll CI against stale Gradle and NeoForm caches Extend setup-java Gradle cache keys to hash Chronos pin files (compile-groups, java-matrix, etc.) and gradle.properties so NeoForge/Minecraft pin bumps invalidate restored ~/.gradle caches. On the build-all job only, disable ModDev NeoForm runtime cache and pass --no-build-cache to buildAll so createMinecraftArtifacts cannot false-green from cross-run build-cache entries after pin changes. Co-authored-by: MagicJinn --- .github/workflows/buildall.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildall.yml b/.github/workflows/buildall.yml index f9e3698..2cf102a 100644 --- a/.github/workflows/buildall.yml +++ b/.github/workflows/buildall.yml @@ -34,6 +34,15 @@ jobs: distribution: microsoft java-version: "25" cache: gradle + cache-dependency-path: | + **/*.gradle* + **/gradle-wrapper.properties + **/gradle.properties + gradle/chronos-compile-groups.json + gradle/chronos-java-matrix.json + gradle/chronos-forge-pack-format.json + gradle/chronos-shell-slices.json + gradle/*.versions.toml - name: Set up Rust nightly uses: dtolnay/rust-toolchain@nightly @@ -68,6 +77,15 @@ jobs: distribution: microsoft java-version: "25" cache: gradle + cache-dependency-path: | + **/*.gradle* + **/gradle-wrapper.properties + **/gradle.properties + gradle/chronos-compile-groups.json + gradle/chronos-java-matrix.json + gradle/chronos-forge-pack-format.json + gradle/chronos-shell-slices.json + gradle/*.versions.toml - name: Download rust native artifacts from all OS jobs uses: actions/download-artifact@v8 @@ -85,7 +103,7 @@ jobs: CHRONOS_VARIANT_GENERATION: "skip" - name: Run buildAll - run: ./gradlew buildAll -PchronosRustSkipBuild=true -PchronosRustRequireAllTargets=false --no-daemon + run: ./gradlew buildAll -PchronosRustSkipBuild=true -PchronosRustRequireAllTargets=false -PneoForge.neoFormRuntime.enableCache=false --no-build-cache --no-daemon - name: Verify rust-pruner natives are packaged run: bash scripts/verify-rust-pruner-natives.sh From 6e46ab78ab5683a468b342744de75e727eec3815 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 16 Sep 2026 07:20:55 +0000 Subject: [PATCH 2/2] Simplify Gradle cache-dependency-path to gradle/** glob Co-authored-by: MagicJinn --- .github/workflows/buildall.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/buildall.yml b/.github/workflows/buildall.yml index 2cf102a..0b942bd 100644 --- a/.github/workflows/buildall.yml +++ b/.github/workflows/buildall.yml @@ -38,11 +38,7 @@ jobs: **/*.gradle* **/gradle-wrapper.properties **/gradle.properties - gradle/chronos-compile-groups.json - gradle/chronos-java-matrix.json - gradle/chronos-forge-pack-format.json - gradle/chronos-shell-slices.json - gradle/*.versions.toml + gradle/** - name: Set up Rust nightly uses: dtolnay/rust-toolchain@nightly @@ -81,11 +77,7 @@ jobs: **/*.gradle* **/gradle-wrapper.properties **/gradle.properties - gradle/chronos-compile-groups.json - gradle/chronos-java-matrix.json - gradle/chronos-forge-pack-format.json - gradle/chronos-shell-slices.json - gradle/*.versions.toml + gradle/** - name: Download rust native artifacts from all OS jobs uses: actions/download-artifact@v8