From 6f38d26cb429b9a83412f580c30b52870953ddd1 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Mon, 4 May 2026 21:40:15 +0300 Subject: [PATCH 01/19] update ci cd --- .github/workflows/release.yml | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..6a84f64 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,42 @@ +name: Android Release +on: + push: + branches: + - main +jobs: + buid: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Sign APK + env: + KEYSTORE_PATH: ${{ secrets.KEYSTORE_PATH }} + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + run: | + ./gradlew assembleRelease + jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 + -keystore $KEYSTORE_PATH app/build/outputs/apk/release/app-release-unsigned.apk $KEY_ALIAS + zipalign -v 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk + + - name: Upload APK + uses: actions/upload-artifact@v2 + with: + name: app-release.apk + path: app/build/outputs/apk/release/app-release.apk \ No newline at end of file From b0a8a36ffe7145b3549c3b13c1a8de9a99d94a67 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 21:28:42 +0300 Subject: [PATCH 02/19] update ci cd --- .github/workflows/release.yml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a84f64..7979000 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,14 +2,14 @@ name: Android Release on: push: branches: - - main + - dev/add-apk-build-ci-cd jobs: buid: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 uses: actions/setup-java@v2 @@ -23,17 +23,30 @@ jobs: - name: Build with Gradle run: ./gradlew build + + - name: Checkout keystore repo + uses: actions/checkout@v2 + with: + repository: ${{ secrets.KEYSTORE_GIT_REPOSITORY }} + token: ${{ secrets.ACCESS_TOKEN }} + path: app/keystore + - name: Sign APK env: - KEYSTORE_PATH: ${{ secrets.KEYSTORE_PATH }} + KEYSTORE_PATH: app/keystore KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} + RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} run: | ./gradlew assembleRelease - jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 - -keystore $KEYSTORE_PATH app/build/outputs/apk/release/app-release-unsigned.apk $KEY_ALIAS - zipalign -v 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk + jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 \ + -keystore "$KEYSTORE_PATH" \ + -storepass "$KEYSTORE_PASSWORD" \ + -keypass "$RELEASE_SIGN_KEY_PASSWORD" \ + app/build/outputs/apk/release/app-release-unsigned.apk "$RELEASE_SIGN_KEY_ALIAS" + zipalign -v 4 \ + app/build/outputs/apk/release/app-release-unsigned.apk \ + app/build/outputs/apk/release/app-release.apk - name: Upload APK uses: actions/upload-artifact@v2 From 4a90580e0424a7fbc694b3201f7c2519ed079017 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 21:31:39 +0300 Subject: [PATCH 03/19] update ci cd --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7979000..7c6999d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6.0.2 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v5.2.0 with: distribution: 'zulu' java-version: 11 @@ -25,7 +25,7 @@ jobs: - name: Checkout keystore repo - uses: actions/checkout@v2 + uses: actions/checkout@v6.0.2 with: repository: ${{ secrets.KEYSTORE_GIT_REPOSITORY }} token: ${{ secrets.ACCESS_TOKEN }} @@ -49,7 +49,7 @@ jobs: app/build/outputs/apk/release/app-release.apk - name: Upload APK - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7.0.1 with: name: app-release.apk path: app/build/outputs/apk/release/app-release.apk \ No newline at end of file From c149a7f12ed6d70a75f431f74284964b97438bc6 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 21:33:01 +0300 Subject: [PATCH 04/19] update ci cd --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c6999d..e00c288 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,11 +11,18 @@ jobs: - name: Checkout repository uses: actions/checkout@v6.0.2 + - name: Checkout keystore repo + uses: actions/checkout@v6.0.2 + with: + repository: ${{ secrets.KEYSTORE_GIT_REPOSITORY }} + token: ${{ secrets.ACCESS_TOKEN }} + path: app/keystore + - name: Set up JDK 11 uses: actions/setup-java@v5.2.0 with: distribution: 'zulu' - java-version: 11 + java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew @@ -24,13 +31,6 @@ jobs: run: ./gradlew build - - name: Checkout keystore repo - uses: actions/checkout@v6.0.2 - with: - repository: ${{ secrets.KEYSTORE_GIT_REPOSITORY }} - token: ${{ secrets.ACCESS_TOKEN }} - path: app/keystore - - name: Sign APK env: KEYSTORE_PATH: app/keystore From 602efaf7521eff9b8b1fcf94102e8d7c2ffed1ad Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 21:38:51 +0300 Subject: [PATCH 05/19] update ci cd --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e00c288..632594d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v6.0.2 with: repository: ${{ secrets.KEYSTORE_GIT_REPOSITORY }} - token: ${{ secrets.ACCESS_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} path: app/keystore - name: Set up JDK 11 From 3087355d57b6605276cb73ad0a4b92bc9681cb84 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 21:49:16 +0300 Subject: [PATCH 06/19] update ci cd --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 632594d..0bbfa3c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v6.0.2 with: repository: ${{ secrets.KEYSTORE_GIT_REPOSITORY }} - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.KEYSTORE_REPOSITORY_TOKEN }} path: app/keystore - name: Set up JDK 11 From a7f688a4bb754d4f8e5671157db949397748ff91 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 21:57:46 +0300 Subject: [PATCH 07/19] update ci cd --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bbfa3c..06657a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,10 +19,10 @@ jobs: path: app/keystore - name: Set up JDK 11 - uses: actions/setup-java@v5.2.0 + uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 17 + java-version: 11 - name: Grant execute permission for gradlew run: chmod +x gradlew From fe13216a6a06fa330e74f09ad8689d2ca37ef5fd Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 22:01:45 +0300 Subject: [PATCH 08/19] update ci cd --- .github/workflows/release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 06657a7..9731142 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,11 +18,14 @@ jobs: token: ${{ secrets.KEYSTORE_REPOSITORY_TOKEN }} path: app/keystore - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 + + - name: Clean project + run: ./gradlew clean - name: Grant execute permission for gradlew run: chmod +x gradlew From 9cefd837c2168f658803eadaceb7e36370008490 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 22:02:32 +0300 Subject: [PATCH 09/19] update ci cd --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9731142..cb08590 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,12 +24,12 @@ jobs: distribution: 'zulu' java-version: 17 - - name: Clean project - run: ./gradlew clean - - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Clean project + run: ./gradlew clean + - name: Build with Gradle run: ./gradlew build From 403bb93f2b81aff714488832addf046c6cc0a5a5 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 22:13:16 +0300 Subject: [PATCH 10/19] update ci cd --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb08590..5ec13aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} run: | - ./gradlew assembleRelease + ./gradlew assembleRelease --stacktrace --info jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 \ -keystore "$KEYSTORE_PATH" \ -storepass "$KEYSTORE_PASSWORD" \ From 174be7b7c5a568e8e93ff13d25df14ab7593ff24 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Fri, 15 May 2026 22:30:50 +0300 Subject: [PATCH 11/19] update ci cd --- .github/workflows/release.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5ec13aa..5caf5ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,28 @@ jobs: token: ${{ secrets.KEYSTORE_REPOSITORY_TOKEN }} path: app/keystore + - name: Generate keys.kt + env: + API_URL: ${{ secrets.API_URL_SECRET }} + WEBSOCKET_URL: ${{ secrets.WEBSOCKET_URL_SECRET }} + run: | + mkdir -p app/src/main/java/com/app/masterplan/di + cat > app/src/main/java/com/app/masterplan/di/keys.kt << EOF + package com.app.masterplan.di + + const val API_URL = "$API_URL" + + EOF + + mkdir -p app/src/main/java/com/app/masterplan/framework/websocket + cat > app/src/main/java/com/app/masterplan/framework/websocket/keys.kt << EOF + package com.app.masterplan.framework.websocket + + const val WEBSOCKET_URL = "WEBSOCKET_URL" + + EOF + + - name: Set up JDK 17 uses: actions/setup-java@v3 with: From 583c0da96a827b0a283f6bc5ae0cbcfc060df2fe Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 17:31:11 +0300 Subject: [PATCH 12/19] update ci cd --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5caf5ea..ec85853 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: - name: Sign APK env: - KEYSTORE_PATH: app/keystore + KEYSTORE_PATH: app/keystore/keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} From d2e0e3abd2f2df80be725f46b3b2533e16f18ea1 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 17:48:05 +0300 Subject: [PATCH 13/19] update ci cd --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec85853..527b5a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: - name: Sign APK env: - KEYSTORE_PATH: app/keystore/keystore.jks + KEYSTORE_PATH: app/keystore/my-keystore KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} From b8f5f4bd657a89896f7cb3a74208734bbf032fcb Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 19:37:15 +0300 Subject: [PATCH 14/19] update ci cd and add sign to gradle --- .github/workflows/release.yml | 8 -------- app/build.gradle.kts | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 527b5a6..acb19c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,14 +64,6 @@ jobs: RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} run: | ./gradlew assembleRelease --stacktrace --info - jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 \ - -keystore "$KEYSTORE_PATH" \ - -storepass "$KEYSTORE_PASSWORD" \ - -keypass "$RELEASE_SIGN_KEY_PASSWORD" \ - app/build/outputs/apk/release/app-release-unsigned.apk "$RELEASE_SIGN_KEY_ALIAS" - zipalign -v 4 \ - app/build/outputs/apk/release/app-release-unsigned.apk \ - app/build/outputs/apk/release/app-release.apk - name: Upload APK uses: actions/upload-artifact@v7.0.1 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7fb5711..afb704e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,8 +22,18 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + signingConfigs { + create("release"){ + storeFile = file(System.getenv("KEYSTORE_PATH") ?: "app/keystore") + storePassword = System.getenv("KEYSTORE_PASSWORD") + keyAlias = System.getenv("RELEASE_SIGN_KEY_ALIAS") + keyPassword = System.getenv("RELEASE_SIGN_KEY_PASSWORD") + } + } + buildTypes { release { + signingConfig = signingConfigs.getByName("release") isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), From 92e9820cd2aeaea58992ab3e40dafb44bd64c37b Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 19:53:55 +0300 Subject: [PATCH 15/19] update ci cd --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acb19c2..a9f843e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,11 @@ on: jobs: buid: runs-on: ubuntu-latest + env: + KEYSTORE_PATH: app/keystore/my-keystore + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} + RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} steps: - name: Checkout repository @@ -57,11 +62,6 @@ jobs: - name: Sign APK - env: - KEYSTORE_PATH: app/keystore/my-keystore - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} - RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} run: | ./gradlew assembleRelease --stacktrace --info From 55445b6a060490dfee86cc23c59974d9cebe3fa4 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 20:01:02 +0300 Subject: [PATCH 16/19] update ci cd --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9f843e..73a7e42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: buid: runs-on: ubuntu-latest env: - KEYSTORE_PATH: app/keystore/my-keystore + KEYSTORE_PATH: keystore/my-keystore KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} RELEASE_SIGN_KEY_ALIAS: ${{ secrets.RELEASE_SIGN_KEY_ALIAS }} RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }} From 35a8f98e586dc59813e601e48600bc9d54666310 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 20:48:22 +0300 Subject: [PATCH 17/19] update ci cd and version --- .github/workflows/release.yml | 23 +++++++++++++++++++---- app/build.gradle.kts | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73a7e42..7acc919 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,13 +60,28 @@ jobs: - name: Build with Gradle run: ./gradlew build + - name: Extract Version Name + id: extract_version + run: | + VERSION_NAME=$(grep -m1 "versionName" app/build.gradle.kts | grep -o '"[^"]*"' | tr -d '"') + echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_OUTPUT - name: Sign APK run: | ./gradlew assembleRelease --stacktrace --info + ./gradlew bundleRelease --stacktrace --info + - - name: Upload APK - uses: actions/upload-artifact@v7.0.1 + - name: Create Tag and Release + id: create_release + uses: softprops/action-gh-release@v3.0.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: app-release.apk - path: app/build/outputs/apk/release/app-release.apk \ No newline at end of file + tag_name: v${{ steps.extract_version.outputs.VERSION_NAME }} + release_name: Release v${{ steps.extract_version.outputs.VERSION_NAME }} + draft: false + prerelease: false + files: | + app/build/outputs/apk/release/app-release.apk + app/build/outputs/bundle/release/app-release.aab \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index afb704e..e060e68 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,7 +17,7 @@ android { minSdk = 26 targetSdk = 36 versionCode = 1 - versionName = "1.0" + versionName = "1.0.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } From 4681ebbfc4c0b155d27faaa717af05a6f1932889 Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 21:51:53 +0300 Subject: [PATCH 18/19] update ci cd permissions --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7acc919..863be18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,12 @@ on: push: branches: - dev/add-apk-build-ci-cd + + +permissions: + contents: write + + jobs: buid: runs-on: ubuntu-latest From 8f6aabede0e55824635664c558f5aebfeb2b08ed Mon Sep 17 00:00:00 2001 From: Leturgone Date: Sat, 16 May 2026 22:08:01 +0300 Subject: [PATCH 19/19] update ci cd branch --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 863be18..4470df7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,10 @@ name: Android Release + on: push: - branches: - - dev/add-apk-build-ci-cd - + branches: [ main ] + pull_request: + branches: [ main ] permissions: contents: write @@ -85,7 +86,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: v${{ steps.extract_version.outputs.VERSION_NAME }} - release_name: Release v${{ steps.extract_version.outputs.VERSION_NAME }} + release_name: MasterPlan v${{ steps.extract_version.outputs.VERSION_NAME }} draft: false prerelease: false files: |