ci: optimise build cache (#2373)

Make sure we only use one gradle cache in each build, instead of two (setup-java + gradle-build-action). Also, prefer Buildjet actions instead of default ones when available. (cherry picked from commit 15ead93)
wireapp · Oct 30, 2023 · f94ee95 · f94ee95
1 parent 0b2fed5
commit f94ee95
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
@@ -17,7 +17,7 @@ jobs:
         submodules: recursive # Needed in order to fetch Kalium sources for building
         fetch-depth: 0
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: buildjet/setup-java@v3
       with:
         java-version: '17'
         distribution: 'temurin'

diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml
@@ -15,7 +15,7 @@ jobs:
           submodules: recursive # Needed in order to fetch Kalium sources for building
           fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: buildjet/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'

diff --git a/.github/workflows/gradle-run-ui-tests.yml b/.github/workflows/gradle-run-ui-tests.yml
@@ -25,21 +25,18 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: buildjet/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: gradle
 
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4
-
-      - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
-
+
       - name: AVD cache
-        uses: actions/cache@v3
-        id: avd-cache
+        uses: buildjet/cache@v3
+        id: avd-cache-${{ runner.os }}
         with:
           path: |
             ~/.android/avd/*

diff --git a/.github/workflows/gradle-run-unit-tests.yml b/.github/workflows/gradle-run-unit-tests.yml
@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: buildjet/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -34,9 +34,6 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4
 
-      - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
-
       - name: Test Build Logic
         run: |
           ./gradlew -p buildSrc test