Bump GH actions and fix gradle caching (#1440)

getsentry · Apr 26, 2021 · a33afef · a33afef
1 parent 053a8ab
commit a33afef
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 37 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,19 +29,15 @@ jobs:
           distribution: 'adopt'
           java-version: '8'
 
-      # use sequential key when bumping dependencies till single lock file is out of preview
-      # https://docs.gradle.org/current/userguide/dependency_locking.html#single_lock_file_per_project
-      - name: Cache Gradle Caches
-        uses: actions/cache@v1
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches/
-          key: cache-gradle-cache-3
-
-      - name: Cache Gradle Wrapper
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/wrapper/
-          key: cache-gradle-wrapper-3
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       # Clean, check formatting, build and do a dry release
       - name: Make all

diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -12,11 +12,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2
       - name: set up JDK 1.8
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
           java-version: '8'
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
       - name: Check formatting with Spotless
         run: make checkFormat
diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml
@@ -9,12 +9,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2
       - name: set up JDK 1.8
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
           java-version: '8'
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
       - name: Generate Aggregate Javadocs
         run: |
           ./gradlew aggregateJavadocs

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml