From 9352563d5306d5378fdcf9da228e5831f82e189e Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Wed, 8 Jan 2025 14:26:06 +0700 Subject: [PATCH] Tweak build workflows --- .github/workflows/build_benchmark.yml | 13 ++++++++----- .github/workflows/build_check.yml | 17 ++++++++++------- .github/workflows/build_dispatch_preview.yml | 3 --- .github/workflows/build_preview.yml | 13 ++++++++----- .github/workflows/build_pull_request.yml | 17 ++++++++++------- .github/workflows/build_pull_request_forked.yml | 13 ++++++++----- .github/workflows/build_release.yml | 16 ++++++++-------- 7 files changed, 52 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build_benchmark.yml b/.github/workflows/build_benchmark.yml index 9b688f182..bf0122e99 100644 --- a/.github/workflows/build_benchmark.yml +++ b/.github/workflows/build_benchmark.yml @@ -33,9 +33,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Prepare env id: prepare_env run: | @@ -82,8 +79,14 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Build Benchmark app and run unit tests - run: ./gradlew spotlessCheck assembleDevBenchmark testDevBenchmarkUnitTest testReleaseUnitTest -Pandroid.signingConfig=debug --stacktrace + - name: Check code format + run: ./gradlew spotlessCheck + + - name: Build app + run: ./gradlew assembleDevBenchmark -Pandroid.signingConfig=debug + + - name: Run unit tests + run: ./gradlew testReleaseUnitTest testDevBenchmarkUnitTest - name: Sign APK uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1 diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 834e38dbf..174ddb2f7 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -38,9 +38,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Setup Android SDK run: | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.3" @@ -68,13 +65,19 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Build app and run unit tests - run: ./gradlew spotlessCheck assembleStandardPreview testStandardPreviewUnitTest testReleaseUnitTest --stacktrace + - name: Check code format + run: ./gradlew spotlessCheck + + - name: Build app + run: ./gradlew assembleStandardRelease + + - name: Run unit tests + run: ./gradlew testReleaseUnitTest testStandardReleaseUnitTest - name: Sign APK uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1 with: - releaseDirectory: app/build/outputs/apk/standard/preview + releaseDirectory: app/build/outputs/apk/standard/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -90,7 +93,7 @@ jobs: echo "VERSION_TAG=$version_tag" >> $GITHUB_OUTPUT echo "COMMIT_COUNT=$commit_count" echo "COMMIT_COUNT=$commit_count" >> $GITHUB_OUTPUT - mv app/build/outputs/apk/standard/preview/app-standard-universal-preview-unsigned-signed.apk Komikku-$version_tag-r$commit_count.apk + mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk Komikku-$version_tag-r$commit_count.apk - name: Upload APK uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 diff --git a/.github/workflows/build_dispatch_preview.yml b/.github/workflows/build_dispatch_preview.yml index 8531e3b6b..b44fffa83 100644 --- a/.github/workflows/build_dispatch_preview.yml +++ b/.github/workflows/build_dispatch_preview.yml @@ -31,9 +31,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Prepare build id: prepare_build run: | diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml index 35bd7170b..b39f6632a 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -44,9 +44,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Get previous release id: last_release uses: InsonusK/get-latest-release@7a9ff16c8c6b7ead5d71c0f1cc61f2703170eade # v1.1.0 @@ -151,8 +148,14 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Build Preview app and run unit tests - run: ./gradlew spotlessCheck assembleStandardPreview testStandardPreviewUnitTest testReleaseUnitTest --stacktrace + - name: Check code format + run: ./gradlew spotlessCheck + + - name: Build app + run: ./gradlew assembleStandardPreview + + - name: Run unit tests + run: ./gradlew testReleaseUnitTest testStandardPreviewUnitTest - name: Upload artifacts uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 41ccc2d85..ece7a25eb 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -38,9 +38,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Dependency Review uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 @@ -71,13 +68,19 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Build app and run unit tests - run: ./gradlew spotlessCheck assembleStandardPreview testStandardPreviewUnitTest testReleaseUnitTest --stacktrace + - name: Check code format + run: ./gradlew spotlessCheck + + - name: Build app + run: ./gradlew assembleStandardRelease + + - name: Run unit tests + run: ./gradlew testReleaseUnitTest testStandardReleaseUnitTest - name: Sign APK uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1 with: - releaseDirectory: app/build/outputs/apk/standard/preview + releaseDirectory: app/build/outputs/apk/standard/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -94,7 +97,7 @@ jobs: echo "VERSION_TAG=$version_tag" >> $GITHUB_OUTPUT echo "COMMIT_COUNT=$commit_count" echo "COMMIT_COUNT=$commit_count" >> $GITHUB_OUTPUT - mv app/build/outputs/apk/standard/preview/app-standard-universal-preview-unsigned-signed.apk Komikku-$version_tag-r$commit_count.apk + mv app/build/outputs/apk/standard/release/app-standard-universal-release-unsigned-signed.apk Komikku-$version_tag-r$commit_count.apk - name: Upload APK uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 diff --git a/.github/workflows/build_pull_request_forked.yml b/.github/workflows/build_pull_request_forked.yml index 1d762f589..9f9c6fa6e 100644 --- a/.github/workflows/build_pull_request_forked.yml +++ b/.github/workflows/build_pull_request_forked.yml @@ -38,9 +38,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Dependency Review uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 @@ -57,8 +54,14 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Build app and run unit tests - run: ./gradlew spotlessCheck assembleDevDebug testDevDebugUnitTest testDebugUnitTest --stacktrace + - name: Check code format + run: ./gradlew spotlessCheck + + - name: Build app + run: ./gradlew assembleDevDebug + + - name: Run unit tests + run: ./gradlew testDebugUnitTest testDevDebugUnitTest - name: Rename apk id: current_commit diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index c043780a6..eeecccae8 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -32,9 +32,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Get previous release id: last_release uses: InsonusK/get-latest-release@7a9ff16c8c6b7ead5d71c0f1cc61f2703170eade # v1.1.0 @@ -97,9 +94,6 @@ jobs: with: fetch-depth: 0 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Setup Android SDK run: | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.3" @@ -127,8 +121,14 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4 - - name: Build app and run unit tests - run: ./gradlew spotlessCheck assembleStandardRelease testStandardReleaseUnitTest testReleaseUnitTest --stacktrace + - name: Check code format + run: ./gradlew spotlessCheck + + - name: Build app + run: ./gradlew assembleStandardRelease + + - name: Run unit tests + run: ./gradlew testReleaseUnitTest testStandardReleaseUnitTest - name: Upload artifacts uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0