From a8c1ba31661b004645d19a227078f57dcef098ba Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 22 Feb 2025 01:10:00 +0800 Subject: [PATCH] chore: bump ci to v4 --- .github/workflows/commit_ci.yml | 8 ++++---- .github/workflows/pull_request_ci.yml | 8 ++++---- app/build.gradle.kts | 9 +++++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/commit_ci.yml b/.github/workflows/commit_ci.yml index 4cc4295..8cf437d 100644 --- a/.github/workflows/commit_ci.yml +++ b/.github/workflows/commit_ci.yml @@ -27,7 +27,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 }} @@ -38,7 +38,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 @@ -69,12 +69,12 @@ jobs: echo "DEBUG_APK_PATH=$(find ${{ env.APK_OUTPUT_PATH }}/debug -name '*.apk')" >> $GITHUB_ENV echo "RELEASE_APK_PATH=$(find ${{ env.APK_OUTPUT_PATH }}/release -name '*.apk')" >> $GITHUB_ENV - name: Upload Artifacts (Debug) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.DEBUG_APK_PATH }} name: ColorOSNotifyIcon-debug-${{ github.event.head_commit.id }} - name: Upload Artifacts (Release) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.RELEASE_APK_PATH }} name: ColorOSNotifyIcon-release-${{ github.event.head_commit.id }} diff --git a/.github/workflows/pull_request_ci.yml b/.github/workflows/pull_request_ci.yml index dd40f13..a0a807b 100644 --- a/.github/workflows/pull_request_ci.yml +++ b/.github/workflows/pull_request_ci.yml @@ -17,7 +17,7 @@ jobs: env: APK_OUTPUT_PATH: 'app/build/outputs/apk' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare GitHub Env run: | GITHUB_SHA=${{ github.sha }} @@ -28,7 +28,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 @@ -59,12 +59,12 @@ jobs: echo "DEBUG_APK_PATH=$(find ${{ env.APK_OUTPUT_PATH }}/debug -name '*.apk')" >> $GITHUB_ENV echo "RELEASE_APK_PATH=$(find ${{ env.APK_OUTPUT_PATH }}/release -name '*.apk')" >> $GITHUB_ENV - name: Upload Artifacts (Debug) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.DEBUG_APK_PATH }} name: ColorOSNotifyIcon-debug-${{ github.event.head_commit.id }} - name: Upload Artifacts (Release) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ${{ env.RELEASE_APK_PATH }} name: ColorOSNotifyIcon-release-${{ github.event.head_commit.id }} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2edecd6..659527e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -63,8 +63,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}-v$currentVersion-$currentType.apk")