From b0317f96fb66842ee1ebb783e0c1c17c33b60815 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:02:46 +0800 Subject: [PATCH 1/9] Use gradle-build-action on CI --- .github/workflows/build.yml | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99b6e0d999..7fcc997904 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: runs-on: macos-latest strategy: matrix: - file: [aapt_64, aapt2_64] + file: [ aapt_64, aapt2_64 ] steps: - uses: actions/checkout@v2 @@ -32,7 +32,7 @@ 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 @@ -47,7 +47,7 @@ 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 @@ -72,13 +72,6 @@ jobs: 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 @@ -90,11 +83,15 @@ jobs: - name: Build and test if: startsWith(matrix.os, 'windows') == true - run: ./gradlew.bat build shadowJar proguard + uses: gradle/gradle-build-action@v2 + with: + arguments: 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 @@ -104,14 +101,6 @@ jobs: - 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 @@ -121,7 +110,9 @@ jobs: 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 From 92ddc53e8a974064ca90951de36705107a1c8031 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:03:11 +0800 Subject: [PATCH 2/9] Bump actions/checkout to v3 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7fcc997904..8e41e31954 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: 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 @@ -35,7 +35,7 @@ jobs: 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 @@ -50,7 +50,7 @@ jobs: 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 @@ -73,7 +73,7 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v2 @@ -101,7 +101,7 @@ jobs: - build-and-test-with-Java-8-and-later steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 10 uses: actions/setup-java@v2 @@ -131,7 +131,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Initialize CodeQL uses: github/codeql-action/init@v1 From b99a1e01a17ad1a7aed7f1ffc12d8aa07ad4693c Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:03:35 +0800 Subject: [PATCH 3/9] Bump actions/setup-java to v2 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e41e31954..8a513d0a9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -104,7 +104,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up JDK 10 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 10 From ffd96c8c5991a0c6827bd15dd64baadc88274937 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:05:38 +0800 Subject: [PATCH 4/9] Rearrange & trim blank lines --- .github/workflows/build.yml | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a513d0a9e..88b9c587dd 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 ] - steps: - 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 @@ -33,13 +31,10 @@ jobs: strategy: matrix: file: [ aapt, aapt_64, aapt2, aapt2_64 ] - steps: - 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 @@ -48,13 +43,10 @@ jobs: strategy: matrix: file: [ aapt.exe, aapt_64.exe, aapt2.exe, aapt2_64.exe ] - steps: - 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 @@ -72,15 +64,11 @@ jobs: java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ] steps: - - uses: actions/checkout@v3 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java }} - - name: Build and test if: startsWith(matrix.os, 'windows') == true uses: gradle/gradle-build-action@v2 @@ -99,21 +87,16 @@ jobs: if: github.repository == 'iBotPeaches/Apktool' && github.ref == 'refs/heads/master' needs: - build-and-test-with-Java-8-and-later - steps: - uses: actions/checkout@v3 - - - name: Set up JDK 10 - uses: actions/setup-java@v3 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 10 - - name: Build uses: gradle/gradle-build-action@v2 with: arguments: build shadowJar proguard - - name: Upload uses: actions/upload-artifact@v2 with: @@ -123,23 +106,18 @@ jobs: analyze: name: Analyze runs-on: ubuntu-latest - strategy: fail-fast: false matrix: language: [ 'java' ] - steps: - name: Checkout repository 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 From e1406d95490ade2f5044e4cf34a79d1d9ebb445a Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:09:07 +0800 Subject: [PATCH 5/9] Bump actions/upload-artifact to v3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88b9c587dd..8a3f8b2003 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: 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 From 86d8df9d47a75be99ce37228bc70aeab20d15fdc Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:10:37 +0800 Subject: [PATCH 6/9] Test on jdk 17 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a3f8b2003..609af4b79e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, macOS-latest, windows-latest ] - java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ] + java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 ] steps: - uses: actions/checkout@v3 From 9feb5162742e208cb577e0207ae9737bcec10d5a Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:18:03 +0800 Subject: [PATCH 7/9] Trim blank lines --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 609af4b79e..23fe6f1adf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,6 @@ jobs: matrix: os: [ ubuntu-latest, macOS-latest, windows-latest ] java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 ] - steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -74,7 +73,6 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: build shadowJar proguard - - name: Build and test if: startsWith(matrix.os, 'windows') != true uses: gradle/gradle-build-action@v2 From 5f50f1871167c6eda24403a205a3beddfd5e5326 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 7 Mar 2022 23:35:09 +0800 Subject: [PATCH 8/9] Revert test on jdk 17 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23fe6f1adf..eb7a7abc69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, macOS-latest, windows-latest ] - java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 ] + java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 From 2462d8690de794d2106dcedf298a86d8e2fc8c15 Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 8 Mar 2022 09:48:59 +0800 Subject: [PATCH 9/9] Merge duplicated build actions --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb7a7abc69..a283a0c6c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,12 +69,6 @@ jobs: distribution: 'zulu' java-version: ${{ matrix.java }} - name: Build and test - if: startsWith(matrix.os, 'windows') == true - uses: gradle/gradle-build-action@v2 - with: - arguments: build shadowJar proguard - - name: Build and test - if: startsWith(matrix.os, 'windows') != true uses: gradle/gradle-build-action@v2 with: arguments: build shadowJar proguard