From a2e6999028fd6a7ff66bf6b6455972f5c09ac770 Mon Sep 17 00:00:00 2001
From: David An <davidan@broadinstitute.org>
Date: Mon, 10 Feb 2025 10:27:14 -0500
Subject: [PATCH] update to latest github actions; action cleanup

---
 .github/workflows/master_push.yml | 10 +++++-----
 .github/workflows/test.yml        | 14 +++-----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/master_push.yml b/.github/workflows/master_push.yml
index b9b9b55..f9b7985 100644
--- a/.github/workflows/master_push.yml
+++ b/.github/workflows/master_push.yml
@@ -42,7 +42,7 @@ jobs:
           echo semver-part=$SEMVER_PART >> $GITHUB_OUTPUT
           echo checkout-branch=$CHECKOUT_BRANCH >> $GITHUB_OUTPUT
       - name: Checkout current code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.controls.outputs.checkout-branch }}
           token: ${{ secrets.BROADBOT_TOKEN }}
@@ -66,22 +66,22 @@ jobs:
           VERSION_SUFFIX: SNAPSHOT
       - name: Auth to GCR
         if: steps.skiptest.outputs.is-bump == 'no'
-        uses: google-github-actions/auth@v1
+        uses: google-github-actions/auth@v2
         with:
-          version: '411.0.0'
           credentials_json: ${{ secrets.GCR_PUBLISH_KEY_B64 }}
       - name: Setup gcloud
         if: steps.skiptest.outputs.is-bump == 'no'
-        uses: google-github-actions/setup-gcloud@v1
+        uses: google-github-actions/setup-gcloud@v2
       - name: Explicitly auth Docker for GCR
         if: steps.skiptest.outputs.is-bump == 'no'
         run: gcloud auth configure-docker --quiet
       - name: Set up JDK 17
         if: steps.skiptest.outputs.is-bump == 'no'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+          cache: 'gradle'
       - name: Grant execute permission for gradlew
         if: steps.skiptest.outputs.is-bump == 'no'
         run: chmod +x gradlew
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 54e1dbc..be81eb4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Skip version bump merges
         id: skiptest
         uses: ./.github/actions/bump-skip
@@ -91,19 +91,11 @@ jobs:
         run: psql -h 127.0.0.1 -U postgres -f ./local-dev/local-postgres-init.sql
       - name: Set up JDK 17
         if: steps.skiptest.outputs.is-bump == 'no'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
-      - name: Cache Gradle packages
-        if: steps.skiptest.outputs.is-bump == 'no'
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: v1-${{ runner.os }}-gradle-${{ hashfiles('**/gradle-wrapper.properties') }}-${{ hashFiles('**/*.gradle') }}
-          restore-keys: v1-${{ runner.os }}-gradle-${{ hashfiles('**/gradle-wrapper.properties') }}
+          cache: 'gradle'
       - name: Grant execute permission for gradlew
         if: steps.skiptest.outputs.is-bump == 'no'
         run: chmod +x gradlew