Key the Gradle cache on the pins, restore-only compat

Address review: include a hash of install-gradle.sh (which holds the
sha256 pins) in the cache key so a fixed pin saves a fresh entry; let
gradle-compatibility.yml only restore, keeping ~1 GB of per-OS zips
out of the repo cache; print the whole usage header; and unzip with
-o so a second run into the same directory reuses the cached zip.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011f9aeT4udaLUf9uZoDNXAx

Author: claude

.github/workflows/ci.yml

@@ -1863,7 +1863,8 @@ jobs:
         continue-on-error: true
         with:
           path: ${{ runner.temp }}/gradle-${{ matrix.gradle }}-bin.zip
-          key: gradle-dist-${{ matrix.gradle }}-${{ runner.os }}
+          # The script holds the pins: a changed pin starts a fresh key.
+          key: gradle-dist-${{ matrix.gradle }}-${{ runner.os }}-${{ hashFiles('scripts/install-gradle.sh') }}
 
       - name: Install Gradle ${{ matrix.gradle }}
         if: matrix.gradle != ''

.github/workflows/gradle-compatibility.yml

@@ -346,16 +346,17 @@ jobs:
           } >> "$GITHUB_ENV"
 
       - name: Restore the Gradle ${{ matrix.gradle }} distribution
-        # ci.yml's e2e legs save this pinned zip from main; restoring it
-        # keeps a github.com release outage from failing these legs. See
-        # the matching step there.
-        id: gradle-dist-cache
+        # ci.yml's e2e legs save this pinned zip from main (every version
+        # on Linux, 8.14.3 on Windows); restoring it keeps a github.com
+        # release outage from failing these legs. See the matching step
+        # there. Restore only: saving every OS x version here would add
+        # ~1 GB of near-duplicate zips to the repo's cache.
         uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         timeout-minutes: 5
         continue-on-error: true
         with:
           path: ${{ runner.temp }}/gradle-${{ matrix.gradle }}-bin.zip
-          key: gradle-dist-${{ matrix.gradle }}-${{ runner.os }}
+          key: gradle-dist-${{ matrix.gradle }}-${{ runner.os }}-${{ hashFiles('scripts/install-gradle.sh') }}
 
       - name: Install Gradle ${{ matrix.gradle }}
         shell: bash
@@ -364,17 +365,6 @@ jobs:
         # Pinned digest, GitHub-release origin: see the script.
         run: scripts/install-gradle.sh "$GRADLE_VERSION" "$RUNNER_TEMP" >> "$GITHUB_ENV"
 
-      - name: Save the Gradle ${{ matrix.gradle }} distribution
-        # The nightly saves the macOS and Windows zips ci.yml never fetches.
-        if: >-
-          github.ref == 'refs/heads/main'
-          && steps.gradle-dist-cache.outputs.cache-hit != 'true'
-          && steps.gradle-dist-cache.outcome == 'success'
-        uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
-        with:
-          path: ${{ runner.temp }}/gradle-${{ matrix.gradle }}-bin.zip
-          key: ${{ steps.gradle-dist-cache.outputs.cache-primary-key }}
-
       - name: Run the ${{ matrix.mode }} suites
         shell: bash
         env:

scripts/install-gradle.sh

@@ -18,7 +18,7 @@
 set -euo pipefail
 
 if [ $# -ne 2 ]; then
-  sed -n '2,15p' "$0" | sed 's/^# \{0,1\}//' >&2
+  sed -n '2,17p' "$0" | sed 's/^# \{0,1\}//' >&2
   exit 2
 fi
 VERSION="$1"
@@ -72,7 +72,7 @@ if [ -z "$fetched" ]; then
 fi
 
 verify
-unzip -q "$zip" -d "$DIR"
+unzip -oq "$zip" -d "$DIR"
 launcher="$DIR/gradle-$VERSION/bin/gradle"
 case "$(uname -s)" in MINGW*|MSYS*|CYGWIN*) launcher="$launcher.bat" ;; esac
 echo "SOCKET_PATCH_GRADLE_E2E_GRADLE=$launcher"