From 69ac19ade202555749a1031e2d5543685b4746a1 Mon Sep 17 00:00:00 2001 From: pylixonly <82711525+pylixonly@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:43:35 +0800 Subject: [PATCH] chore: Update artifact upload action version and bump version on release --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fc257c..580e625 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,13 +41,13 @@ jobs: run: mv /tmp/pyonbuild/apks/app-release-aligned-debugSigned.apk /tmp/pyonbuild/apks/app-release.apk - name: "Upload debug APK" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: app-debug path: /tmp/pyonbuild/apks/app-debug.apk - name: "Upload release APK" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: app-release path: /tmp/pyonbuild/apks/app-release.apk \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e4d0a2..901be79 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,9 @@ on: description: This releases version code default: "1000" +permissions: + contents: write + jobs: build: runs-on: ubuntu-latest @@ -35,11 +38,28 @@ jobs: versionCode: ${{github.event.inputs.versionCode}} versionName: ${{github.event.inputs.versionName}} + - name: Bump Version + continue-on-error: true + run: | + git config --local user.email "actions@github.com" + git config --local user.name "GitHub Actions" + git add app/build.gradle.kts + if ! git diff --quiet app/build.gradle.kts; then + git commit -m "chore: Bump version to ${{github.event.inputs.versionName}} (${{github.event.inputs.versionCode}})" + git push + else + echo "No changes to version file, skipping commit" + fi + - name: Build Signed APK run: | echo "${{ secrets.keystore }}" | base64 -d > $GITHUB_WORKSPACE/signing-key.jks chmod +x ./gradlew - ./gradlew packageReleaseUniversalApk -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/signing-key.jks -Pandroid.injected.signing.store.password=${{ secrets.keystore_password }} -Pandroid.injected.signing.key.alias=${{ secrets.key_alias }} -Pandroid.injected.signing.key.password=${{ secrets.key_password }} + ./gradlew packageReleaseUniversalApk \ + -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/signing-key.jks \ + -Pandroid.injected.signing.store.password=${{ secrets.keystore_password }} \ + -Pandroid.injected.signing.key.alias=${{ secrets.key_alias }} \ + -Pandroid.injected.signing.key.password=${{ secrets.key_password }} - name: Release run: |