From cabf0250825215bb2eeb12a26959b286481ba046 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 22 Feb 2025 01:16:07 +0800 Subject: [PATCH] chore: bump ci to v4 --- .github/workflows/commit_ci.yml | 12 ++++++------ .github/workflows/pull_request_ci.yml | 12 ++++++------ demo-app/build.gradle.kts | 9 +++++++-- module-app/build.gradle.kts | 9 +++++++-- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/commit_ci.yml b/.github/workflows/commit_ci.yml index b802afd..bc6244d 100644 --- a/.github/workflows/commit_ci.yml +++ b/.github/workflows/commit_ci.yml @@ -29,7 +29,7 @@ jobs: See commit detail [here](${{ github.event.head_commit.url }}) COMMIT_URL: ${{ github.event.head_commit.url }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare GitHub Env run: | GITHUB_SHA=${{ github.sha }} @@ -40,7 +40,7 @@ jobs: with: cmake-version: '3.22.1' - name: Prepare Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 java-package: jdk @@ -75,22 +75,22 @@ jobs: echo "DEMO_DEBUG_APK_PATH=$(find ${{ env.DEMO_APK_OUTPUT_PATH }}/debug -name '*.apk')" >> $GITHUB_ENV echo "DEMO_RELEASE_APK_PATH=$(find ${{ env.DEMO_APK_OUTPUT_PATH }}/release -name '*.apk')" >> $GITHUB_ENV - name: Upload Artifacts (Module-Debug) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.MODULE_DEBUG_APK_PATH }} name: AppErrorsTracking-module-debug-${{ github.event.head_commit.id }} - name: Upload Artifacts (Module-Release) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.MODULE_RELEASE_APK_PATH }} name: AppErrorsTracking-module-release-${{ github.event.head_commit.id }} - name: Upload Artifacts (Demo-Debug) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.DEMO_DEBUG_APK_PATH }} name: AppErrorsTracking-demo-debug-${{ github.event.head_commit.id }} - name: Upload Artifacts (Demo-Release) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.DEMO_RELEASE_APK_PATH }} name: AppErrorsTracking-demo-release-${{ github.event.head_commit.id }} diff --git a/.github/workflows/pull_request_ci.yml b/.github/workflows/pull_request_ci.yml index 3d78104..05f4cee 100644 --- a/.github/workflows/pull_request_ci.yml +++ b/.github/workflows/pull_request_ci.yml @@ -18,7 +18,7 @@ jobs: MODULE_APK_OUTPUT_PATH: 'module-app/build/outputs/apk' DEMO_APK_OUTPUT_PATH: 'demo-app/build/outputs/apk' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare GitHub Env run: | GITHUB_SHA=${{ github.sha }} @@ -29,7 +29,7 @@ jobs: with: cmake-version: '3.22.1' - name: Prepare Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 java-package: jdk @@ -64,22 +64,22 @@ jobs: echo "DEMO_DEBUG_APK_PATH=$(find ${{ env.DEMO_APK_OUTPUT_PATH }}/debug -name '*.apk')" >> $GITHUB_ENV echo "DEMO_RELEASE_APK_PATH=$(find ${{ env.DEMO_APK_OUTPUT_PATH }}/release -name '*.apk')" >> $GITHUB_ENV - name: Upload Artifacts (Module-Debug) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.MODULE_DEBUG_APK_PATH }} name: AppErrorsTracking-module-debug-${{ github.event.head_commit.id }} - name: Upload Artifacts (Module-Release) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.MODULE_RELEASE_APK_PATH }} name: AppErrorsTracking-module-release-${{ github.event.head_commit.id }} - name: Upload Artifacts (Demo-Debug) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.DEMO_DEBUG_APK_PATH }} name: AppErrorsTracking-demo-debug-${{ github.event.head_commit.id }} - name: Upload Artifacts (Demo-Release) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.DEMO_RELEASE_APK_PATH }} name: AppErrorsTracking-demo-release-${{ github.event.head_commit.id }} \ No newline at end of file diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index e04f38a..cb130f3 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -68,8 +68,13 @@ androidComponents { // Why? I don't know, but it works. // Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: // public inline fun CharSequence.isNotBlank(): Boolean defined in kotlin.text. - @Suppress("UNNECESSARY_SAFE_CALL") - val currentSuffix = property.github.ci.commit.id?.let { suffix -> if (suffix.isNotBlank()) "-$suffix" else "" } + @Suppress("UNNECESSARY_SAFE_CALL", "RemoveRedundantCallsOfConversionMethods") + val currentSuffix = property.github.ci.commit.id?.let { suffix -> + // Workaround for GitHub Actions. + // Strongly transfer type to [String]. + val sSuffix = suffix.toString() + if (sSuffix.isNotBlank()) "-$sSuffix" else "" + } val currentVersion = "${output.versionName.get()}$currentSuffix(${output.versionCode.get()})" if (output is com.android.build.api.variant.impl.VariantOutputImpl) output.outputFileName.set("${property.project.name}-demo-v$currentVersion-$currentType.apk") diff --git a/module-app/build.gradle.kts b/module-app/build.gradle.kts index b445dc2..1943cfe 100644 --- a/module-app/build.gradle.kts +++ b/module-app/build.gradle.kts @@ -64,8 +64,13 @@ androidComponents { // Why? I don't know, but it works. // Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: // public inline fun CharSequence.isNotBlank(): Boolean defined in kotlin.text. - @Suppress("UNNECESSARY_SAFE_CALL") - val currentSuffix = property.github.ci.commit.id?.let { suffix -> if (suffix.isNotBlank()) "-$suffix" else "" } + @Suppress("UNNECESSARY_SAFE_CALL", "RemoveRedundantCallsOfConversionMethods") + val currentSuffix = property.github.ci.commit.id?.let { suffix -> + // Workaround for GitHub Actions. + // Strongly transfer type to [String]. + val sSuffix = suffix.toString() + if (sSuffix.isNotBlank()) "-$sSuffix" else "" + } val currentVersion = "${output.versionName.get()}$currentSuffix(${output.versionCode.get()})" if (output is com.android.build.api.variant.impl.VariantOutputImpl) output.outputFileName.set("${property.project.name}-module-v$currentVersion-$currentType.apk")