From 40aac1c4c333e594024c5629fbd160cd504f9fbf Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Fri, 12 Jul 2024 01:16:38 +0300 Subject: [PATCH] update gh actions --- .github/workflows/android_dev.yml | 20 +++++++++----------- .github/workflows/android_master.yml | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.github/workflows/android_dev.yml b/.github/workflows/android_dev.yml index ac2cdedd..b42b223e 100644 --- a/.github/workflows/android_dev.yml +++ b/.github/workflows/android_dev.yml @@ -1,8 +1,6 @@ name: Android CI on: - pull_request: - branches: [ "dev" ] push: branches: [ "dev" ] @@ -14,7 +12,7 @@ env: jobs: build_apk_aab: runs-on: ubuntu-latest - name: Build dev artifacts + name: Build artifacts steps: - name: Checkout uses: actions/checkout@v4 @@ -32,17 +30,17 @@ jobs: - name: Build and sign debug APKs run: ./gradlew assembleDebug + - name: Upload debug APK + uses: actions/upload-artifact@v4 + with: + name: app-debug.apk + path: app/build/outputs/apk/amethyst/debug/app-amethyst-debug.apk + - name: Build and sign release APKs run: ./gradlew assembleRelease - - name: Upload dev-debug APK + - name: Upload release APK uses: actions/upload-artifact@v4 with: - name: app-dev-debug.apk - path: app/build/outputs/apk/amethyst/debug/app-amethyst-debug.apk - - - name: Upload dev-release APK - uses: actions/upload-artifact@v4 - with: - name: app-dev-release.apk + name: app-release.apk path: app/build/outputs/apk/amethyst/release/app-amethyst-release.apk diff --git a/.github/workflows/android_master.yml b/.github/workflows/android_master.yml index d32fee80..e2f588c6 100644 --- a/.github/workflows/android_master.yml +++ b/.github/workflows/android_master.yml @@ -12,9 +12,8 @@ env: jobs: build_apk_aab: runs-on: ubuntu-latest - name: Build full artifacts + name: Build artifacts steps: - - name: Checkout uses: actions/checkout@v4 @@ -31,17 +30,17 @@ jobs: - name: Build and sign debug APKs run: ./gradlew assembleDebug + - name: Upload debug APK + uses: actions/upload-artifact@v4 + with: + name: app-debug.apk + path: app/build/outputs/apk/amethyst/debug/app-amethyst-debug.apk + - name: Build and sign release APKs run: ./gradlew assembleRelease - - name: Upload full-debug APK + - name: Upload release APK uses: actions/upload-artifact@v4 with: - name: app-full-debug.apk - path: app/build/outputs/apk/full/debug/app-full-debug.apk - - - name: Upload full-release APK - uses: actions/upload-artifact@v4 - with: - name: app-full-release.apk - path: app/build/outputs/apk/full/release/app-full-release.apk + name: app-release.apk + path: app/build/outputs/apk/amethyst/release/app-amethyst-release.apk