From 7fd91369e8e12ea9d879e7deac64fbbfddb96555 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 13 Mar 2022 19:40:02 +0800
Subject: [PATCH] Optimize CI a bit (#2773)

* Use gradle-build-action on CI

* Bump actions/checkout to v3

* Bump actions/setup-java to v2

* Rearrange & trim blank lines

* Bump actions/upload-artifact to v3

* Test on jdk 17

* Trim blank lines

* Revert test on jdk 17

* Merge duplicated build actions
---
 .github/workflows/build.yml | 81 ++++++++++---------------------------
 1 file changed, 21 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 99b6e0d999..a283a0c6c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,4 @@
 name: CI
-env:
-  BINARY_PATH: brut.apktool/apktool-lib/src/main/resources/prebuilt
 on:
   push:
     branches:
@@ -12,19 +10,19 @@ on:
       - 'brut.apktool/apktool-lib/src/main/resources/**'
       - '.github/workflows/**'
 
+env:
+  BINARY_PATH: brut.apktool/apktool-lib/src/main/resources/prebuilt
+
 jobs:
   analyze-mac-aapt:
     runs-on: macos-latest
     strategy:
       matrix:
-        file: [aapt_64, aapt2_64]
-
+        file: [ aapt_64, aapt2_64 ]
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
       - name: Verify Executable
         run: ${{ env.BINARY_PATH }}/macosx/${{ matrix.file }} version
-
       - name: Output Static
         run: otool -L ${{ env.BINARY_PATH }}/macosx/${{ matrix.file }} || true
 
@@ -32,14 +30,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        file: [aapt, aapt_64, aapt2, aapt2_64]
-
+        file: [ aapt, aapt_64, aapt2, aapt2_64 ]
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
       - name: Verify Executable
         run: ${{ env.BINARY_PATH }}/linux/${{ matrix.file }} version
-
       - name: Output Static
         run: ldd ${{ env.BINARY_PATH }}/linux/${{ matrix.file }} || true
 
@@ -47,14 +42,11 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        file: [aapt.exe, aapt_64.exe, aapt2.exe, aapt2_64.exe]
-
+        file: [ aapt.exe, aapt_64.exe, aapt2.exe, aapt2_64.exe ]
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
       - name: Verify Executable
         run: ${{ env.BINARY_PATH }}/windows/${{ matrix.file }} version
-
       - name: Output Static
         run: ldd ${{ env.BINARY_PATH }}/windows/${{ matrix.file }} || true
 
@@ -70,31 +62,16 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
         java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ]
-
     steps:
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ matrix.java }}-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.java }}-gradle-
-
-      - uses: actions/checkout@v2
-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-
       - name: Build and test
-        if: startsWith(matrix.os, 'windows') == true
-        run: ./gradlew.bat build shadowJar proguard
-
-      - name: Build and test
-        if: startsWith(matrix.os, 'windows') != true
-        run: ./gradlew build shadowJar proguard
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build shadowJar proguard
 
   upload-artifact:
     runs-on: ubuntu-latest
@@ -102,29 +79,18 @@ jobs:
     if: github.repository == 'iBotPeaches/Apktool' && github.ref == 'refs/heads/master'
     needs:
       - build-and-test-with-Java-8-and-later
-
     steps:
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ matrix.java }}-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.java }}-gradle-
-
-      - uses: actions/checkout@v2
-
-      - name: Set up JDK 10
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 10
-
       - name: Build
-        run: ./gradlew build shadowJar proguard
-
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build shadowJar proguard
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: apktool.jar
           path: brut.apktool/apktool-cli/build/libs/apktool-*-small.jar
@@ -132,23 +98,18 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-
+        uses: actions/checkout@v3
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
           languages: ${{ matrix.language }}
-
       - name: Autobuild
         uses: github/codeql-action/autobuild@v1
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v1