From 82695ccf6f1525717e21d5875a1557d3ec0a3a7c Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Sat, 14 Dec 2024 12:34:53 +0300 Subject: [PATCH] Release 0.1.4 (#95) update gh actions --- .../{android_master.yml => build.yml} | 12 ++-- .github/workflows/create_release.yml | 64 +++++++++++++++++++ gradle/libs.versions.toml | 4 +- 3 files changed, 72 insertions(+), 8 deletions(-) rename .github/workflows/{android_master.yml => build.yml} (81%) create mode 100644 .github/workflows/create_release.yml diff --git a/.github/workflows/android_master.yml b/.github/workflows/build.yml similarity index 81% rename from .github/workflows/android_master.yml rename to .github/workflows/build.yml index c7f6fe92..b98f7521 100644 --- a/.github/workflows/android_master.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ -name: Android CI +name: Android CI Build on: push: - branches: [ "master" ] + branches: [ "dev", "release/*", "hotfix/*" ] pull_request: - branches: [ "master" ] + branches: [ "dev", "release/*", "hotfix/*" ] env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} @@ -13,7 +13,7 @@ env: jobs: build_apk_aab: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 name: Build artifacts steps: - name: Checkout @@ -29,7 +29,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Build and sign debug APKs + - name: Build and sign debug APK run: ./gradlew assembleDebug - name: Upload debug APK @@ -38,7 +38,7 @@ jobs: name: app-debug.apk path: app/build/outputs/apk/debug/app-debug.apk - - name: Build and sign release APKs + - name: Build and sign release APK run: ./gradlew assembleRelease - name: Upload release APK diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml new file mode 100644 index 00000000..9b34291a --- /dev/null +++ b/.github/workflows/create_release.yml @@ -0,0 +1,64 @@ +name: Android CI Release + +on: + pull_request: + branches: [ "master" ] + +env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} + RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} + +jobs: + create_release: + runs-on: ubuntu-24.04 + name: Build artifacts + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build and sign debug APK + run: ./gradlew assembleDebug + + - name: Upload debug APK + uses: actions/upload-artifact@v4 + with: + name: app-debug.apk + path: app/build/outputs/apk/debug/app-debug.apk + + - name: Build and sign release APK + run: ./gradlew assembleRelease + + - name: Upload release APK + uses: actions/upload-artifact@v4 + with: + name: app-release.apk + path: app/build/outputs/apk/release/app-release.apk + + - name: Build and sign debug Bundle + run: ./gradlew bundleDebug + + - name: Upload debug Bundle + uses: actions/upload-artifact@v4 + with: + name: app-debug.aab + path: app/build/outputs/bundle/debug/app-debug.aab + + - name: Build and sign release Bundle + run: ./gradlew bundleRelease + + - name: Upload release Bundle + uses: actions/upload-artifact@v4 + with: + name: app-release.aab + path: app/build/outputs/bundle/release/app-release.aab diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a1a19ed1..04d53238 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ minSdk = "23" targetSdk = "35" compileSdk = "35" -versionCode = "6" -versionName = "0.1.3" +versionCode = "7" +versionName = "0.1.4" agp = "8.7.3" converterMoshi = "2.11.0"