diff --git a/.github/workflows/strato-android-build.yml b/.github/workflows/strato-android-build.yml index a2a8c74..3ba2a2e 100644 --- a/.github/workflows/strato-android-build.yml +++ b/.github/workflows/strato-android-build.yml @@ -70,7 +70,7 @@ jobs: cd ${{ github.workspace }}/strato chmod +x ./gradlew ./gradlew --no-daemon --stacktrace --build-cache --parallel --configure-on-demand assemble${{ github.event.inputs.flavor || 'mainline' }}Release - mv $(find app/build/outputs/apk -type f | grep -E "\.apk$") ${{ github.workspace }}/strato-${{ github.event.inputs.flavor || 'mainline' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + mv $(find app/build/outputs/apk -type f | grep -E "\.apk$") ${{ github.workspace }}/strato-android-${{ github.event.inputs.flavor || 'mainline' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk ccache -sv - name: Release Strato Android (Strato-Android) @@ -78,11 +78,11 @@ jobs: with: name: Strato Android ${{ steps.version.outputs.date }} tag_name: strato-android - files: ${{ github.workspace }}/strato-${{ github.event.inputs.flavor || 'mainline' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + files: ${{ github.workspace }}/strato-android-${{ github.event.inputs.flavor || 'mainline' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk - name: Release Strato Android ${{ steps.version.outputs.date }} uses: softprops/action-gh-release@v2 with: name: ${{ steps.version.outputs.date }} tag_name: ${{ steps.version.outputs.date }} - files: ${{ github.workspace }}/strato-${{ github.event.inputs.flavor || 'mainline' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk \ No newline at end of file + files: ${{ github.workspace }}/strato-android-${{ github.event.inputs.flavor || 'mainline' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk \ No newline at end of file diff --git a/.github/workflows/sudachi-android-build.yml b/.github/workflows/sudachi-android-build.yml index b32f5ee..0103bfb 100644 --- a/.github/workflows/sudachi-android-build.yml +++ b/.github/workflows/sudachi-android-build.yml @@ -65,7 +65,7 @@ jobs: chmod +x ./gradlew ./gradlew "assembleMainlineRelease" # bash gradlew build - mv $(find app/build/outputs/apk -type f | grep -E "\.apk$") ${{ github.workspace }}/sudachi-${{ github.event.inputs.flavor || 'ea' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + mv $(find app/build/outputs/apk -type f | grep -E "\.apk$") ${{ github.workspace }}/sudachi-android-${{ github.event.inputs.flavor || 'ea' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk ccache -sv - name: Release Sudachi (Sudachi-Android) @@ -73,11 +73,11 @@ jobs: with: name: Sudachi Android ${{ steps.version.outputs.date }} tag_name: sudachi-android - files: ${{ github.workspace }}/sudachi-${{ github.event.inputs.flavor || 'ea' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + files: ${{ github.workspace }}/sudachi-android-${{ github.event.inputs.flavor || 'ea' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk - name: Release Sudachi ${{ steps.version.outputs.date }} uses: softprops/action-gh-release@v2 with: name: ${{ steps.version.outputs.date }} tag_name: ${{ steps.version.outputs.date }} - files: ${{ github.workspace }}/sudachi-${{ github.event.inputs.flavor || 'ea' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + files: ${{ github.workspace }}/sudachi-android-${{ github.event.inputs.flavor || 'ea' }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk diff --git a/.github/workflows/suyu-android-build.yml b/.github/workflows/suyu-android-build.yml index decd879..36a3cd4 100644 --- a/.github/workflows/suyu-android-build.yml +++ b/.github/workflows/suyu-android-build.yml @@ -57,7 +57,7 @@ jobs: cd ${{ github.workspace }}/suyu/src/android chmod +x ./gradlew ./gradlew "assembleMainlineRelease" - mv app/build/outputs/apk/mainline/release/app-mainline-release.apk ${{ github.workspace }}/suyu-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + mv app/build/outputs/apk/mainline/release/app-mainline-release.apk ${{ github.workspace }}/suyu-android-mainline-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk ccache -sv - name: Release Suyu Android (Suyu-Android) @@ -65,11 +65,11 @@ jobs: with: name: Suyu Android ${{ steps.version.outputs.date }} tag_name: suyu-android - files: ${{ github.workspace }}/suyu-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk + files: ${{ github.workspace }}/suyu-android-mainline-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk - name: Release Suyu Android ${{ steps.version.outputs.date }} uses: softprops/action-gh-release@v2 with: name: ${{ steps.version.outputs.date }} tag_name: ${{ steps.version.outputs.date }} - files: ${{ github.workspace }}/suyu-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk \ No newline at end of file + files: ${{ github.workspace }}/suyu-android-mainline-${{ steps.version.outputs.date }}-${{ steps.version.outputs.version }}.apk \ No newline at end of file diff --git a/script/upload.ps1 b/script/upload.ps1 index 5247e0f..3eaef70 100644 --- a/script/upload.ps1 +++ b/script/upload.ps1 @@ -4,14 +4,8 @@ param($BUILD_NAME, $BUILD_DATE, $BUILD_TAG) Set-Location $env:GITHUB_WORKSPACE\suyu -if ("$BUILD_NAME" -eq "mainline") { - $RELEASE_DIST = "suyu-windows-msvc" -} -else { - $RELEASE_DIST = "suyu-windows-msvc-$BUILD_NAME" -} - -$MSVC_BUILD_ZIP = "suyu-windows-msvc-$BUILD_DATE-$BUILD_TAG.zip" -replace " ", "" +$RELEASE_DIST = "suyu-windows-$BUILD_NAME" +$MSVC_BUILD_ZIP = "suyu-windows-$BUILD_DATE-$BUILD_TAG.zip" -replace " ", "" $env:BUILD_ZIP = $MSVC_BUILD_ZIP if (Test-Path -Path ".\build\bin\Release") {