From e787000ec5f3d2bbd0c7df78ea77374ae0ac6365 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Mon, 15 Sep 2025 20:34:41 +0900 Subject: [PATCH 1/4] [release] v2.0.0 From 4f7a874f368e67ba88a2d2864144911ea32a1683 Mon Sep 17 00:00:00 2001 From: Ju YunGyeom <30407907+yuni-ju@users.noreply.github.com> Date: Mon, 15 Sep 2025 21:22:46 +0900 Subject: [PATCH 2/4] [cd] Split release workflow for 1.x.x and 2.x.x+ branches --- .github/workflows/Android-release CD.yml | 26 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Android-release CD.yml b/.github/workflows/Android-release CD.yml index 087926cc..c08b01ee 100644 --- a/.github/workflows/Android-release CD.yml +++ b/.github/workflows/Android-release CD.yml @@ -55,17 +55,31 @@ jobs: echo '${{ secrets.SENTRY_PROPERTIES }}' > ./app/src/main/resources/sentry.properties # Build AAB Release - - name: Build release Bundle + - name: Build release Bundle (1.x.x) run: ./gradlew clean bundleRelease + if: startsWith(github.ref, 'refs/heads/release/1.') + + - name: Build prodRelease Bundle (2.x.x+) + run: ./gradlew clean bundleProdRelease + if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.') # Upload Google Play - - name: Deploy to Play Store 🚀 + - name: Deploy to Play Store 🚀 (1.x.x) + uses: r0adkll/upload-google-play@v1 + with: + serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }} + packageName: ${{ secrets.AOS_PACKAGE_NAME }} + releaseFiles: app/build/outputs/bundle/release/app-release.aab + track: production + status: draft + if: startsWith(github.ref, 'refs/heads/release/1.') + + - name: Deploy to Play Store 🚀 (2.0.0+) uses: r0adkll/upload-google-play@v1 with: serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }} - packageName: ${{secrets.AOS_PACKAGE_NAME}} - releaseFiles: ./app/build/outputs/bundle/release/app-release.aab + packageName: ${{ secrets.AOS_PACKAGE_NAME }} + releaseFiles: app/build/outputs/bundle/prodRelease/app-prod-release.aab track: production status: draft - if: github.ref != 'refs/heads/main' - + if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.') From 3b013b2ee23a7268e550f5329e935e5c3b8b47c1 Mon Sep 17 00:00:00 2001 From: Ju YunGyeom <30407907+yuni-ju@users.noreply.github.com> Date: Mon, 15 Sep 2025 21:26:48 +0900 Subject: [PATCH 3/4] [cd] Split release workflow for 1.x.x and 2.x.x+ branches --- .github/workflows/Android-release CD.yml | 26 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Android-release CD.yml b/.github/workflows/Android-release CD.yml index 087926cc..c08b01ee 100644 --- a/.github/workflows/Android-release CD.yml +++ b/.github/workflows/Android-release CD.yml @@ -55,17 +55,31 @@ jobs: echo '${{ secrets.SENTRY_PROPERTIES }}' > ./app/src/main/resources/sentry.properties # Build AAB Release - - name: Build release Bundle + - name: Build release Bundle (1.x.x) run: ./gradlew clean bundleRelease + if: startsWith(github.ref, 'refs/heads/release/1.') + + - name: Build prodRelease Bundle (2.x.x+) + run: ./gradlew clean bundleProdRelease + if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.') # Upload Google Play - - name: Deploy to Play Store 🚀 + - name: Deploy to Play Store 🚀 (1.x.x) + uses: r0adkll/upload-google-play@v1 + with: + serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }} + packageName: ${{ secrets.AOS_PACKAGE_NAME }} + releaseFiles: app/build/outputs/bundle/release/app-release.aab + track: production + status: draft + if: startsWith(github.ref, 'refs/heads/release/1.') + + - name: Deploy to Play Store 🚀 (2.0.0+) uses: r0adkll/upload-google-play@v1 with: serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }} - packageName: ${{secrets.AOS_PACKAGE_NAME}} - releaseFiles: ./app/build/outputs/bundle/release/app-release.aab + packageName: ${{ secrets.AOS_PACKAGE_NAME }} + releaseFiles: app/build/outputs/bundle/prodRelease/app-prod-release.aab track: production status: draft - if: github.ref != 'refs/heads/main' - + if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.') From 43e7d3ea015ac47ec69388303a1efa9bec3b311e Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Mon, 15 Sep 2025 22:05:42 +0900 Subject: [PATCH 4/4] [doc] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8ff7f83..046395a8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ - Clean Architecture With MVVM Pattern ## Team Members for Android -- 주윤겸(@gemiJ) +- 주윤겸(@yuni-ju) - 허동준(@DongJun-H) ## Installation @@ -68,4 +68,4 @@ git clone git@github.com:Daily-DAYO/DAYO_Android.git e.g. border_white_fill_12 ## Copyright -Copyrightⓒ 2021-2023 DAYO, All rights reserved. +Copyrightⓒ 2021- DAYO, All rights reserved.