From b46945b84bfab2343f8ddce57de279a17afabfc7 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sat, 26 Oct 2024 23:22:12 +0900 Subject: [PATCH 01/10] =?UTF-8?q?[add]=20#290=20data=20null=EC=9D=BC?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EB=B8=94=EB=A1=9D=20=ED=83=88=EC=B6=9C?= =?UTF-8?q?=ED=95=98=EA=B3=A0=20=EB=A6=AC=ED=84=B4=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20=EC=B6=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .github/workflows/winey-cd.yml diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml new file mode 100644 index 00000000..cce2790a --- /dev/null +++ b/.github/workflows/winey-cd.yml @@ -0,0 +1,78 @@ +env: + GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false" + GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true + +on: + pull_request: + branches: + - develop + +jobs: + cd-build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: 17 + + - name: Generate winey.keystore.jks + run: echo '${{ secrets.WINEY_KEYSTORE }}' | base64 -d > ./app/winey.jks + + - name: Generate local.properties + env: + AUTH_BASE_URL: ${{ secrets.AUTH_BASE_URL }} + KAKAO_NATIVE_KEY: ${{ secrets.KAKAO_NATIVE_KEY }} + AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: | + echo "auth.base.url=$AUTH_BASE_URL" >> ./local.properties + echo "kakao.native.key=$KAKAO_NATIVE_KEY" >> ./local.properties + echo "amplitude.api.key=$AMPLITUDE_API_KEY" >> ./local.properties + echo "kakaoNativeKey=$KAKAO_NATIVE_KEY" >> ./local.properties + echo "keyAlias=$KEY_ALIAS" >> ./local.properties + echo "keyPassword=$KEY_PASSWORD" >> ./local.properties + echo "storePassword=$STORE_PASSWORD" >> ./local.properties + + - name: Generate google-services.json + run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --d > ./app/google-services.json + + - name: Extract Version Name + run: echo "##[set-output name=version;]v$(echo '${{ github.event.pull_request.title }}' | grep -oP 'release v\K[0-9]+\.[0-9]+\.[0-9]+')" + id: extract_version + + - name: Build Release APK + run: | + ./gradlew :app:assembleRelease + + - name: Upload Release Build to Artifacts + uses: actions/upload-artifact@v3 + with: + name: release-artifacts + path: app/build/outputs/apk/release/ + if-no-files-found: error + + - name: Create Github Release + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{ steps.extract_version.outputs.version }} + release_name: ${{ steps.extract_version.outputs.version }} + generate_release_notes: true + files: | + app/build/outputs/apk/release/app-release.apk + + - name: Upload artifact to Firebase App Distribution + uses: wzieba/Firebase-Distribution-Github-Action@v1 + with: + appId: ${{secrets.FIREBASE_APP_ID}} + serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} + groups: testers + file: app/build/outputs/apk/release/app-release.apk From 0cf2db4074d2f875569c5f500fa446af259a6766 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sat, 26 Oct 2024 23:23:16 +0900 Subject: [PATCH 02/10] =?UTF-8?q?Revert=20"[add]=20#290=20data=20null?= =?UTF-8?q?=EC=9D=BC=EA=B2=BD=EC=9A=B0=20=EB=B8=94=EB=A1=9D=20=ED=83=88?= =?UTF-8?q?=EC=B6=9C=ED=95=98=EA=B3=A0=20=EB=A6=AC=ED=84=B4=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20=EC=B6=94"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b46945b84bfab2343f8ddce57de279a17afabfc7. --- .github/workflows/winey-cd.yml | 78 ---------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 .github/workflows/winey-cd.yml diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml deleted file mode 100644 index cce2790a..00000000 --- a/.github/workflows/winey-cd.yml +++ /dev/null @@ -1,78 +0,0 @@ -env: - GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false" - GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true - -on: - pull_request: - branches: - - develop - -jobs: - cd-build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: 'corretto' - java-version: 17 - - - name: Generate winey.keystore.jks - run: echo '${{ secrets.WINEY_KEYSTORE }}' | base64 -d > ./app/winey.jks - - - name: Generate local.properties - env: - AUTH_BASE_URL: ${{ secrets.AUTH_BASE_URL }} - KAKAO_NATIVE_KEY: ${{ secrets.KAKAO_NATIVE_KEY }} - AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} - run: | - echo "auth.base.url=$AUTH_BASE_URL" >> ./local.properties - echo "kakao.native.key=$KAKAO_NATIVE_KEY" >> ./local.properties - echo "amplitude.api.key=$AMPLITUDE_API_KEY" >> ./local.properties - echo "kakaoNativeKey=$KAKAO_NATIVE_KEY" >> ./local.properties - echo "keyAlias=$KEY_ALIAS" >> ./local.properties - echo "keyPassword=$KEY_PASSWORD" >> ./local.properties - echo "storePassword=$STORE_PASSWORD" >> ./local.properties - - - name: Generate google-services.json - run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --d > ./app/google-services.json - - - name: Extract Version Name - run: echo "##[set-output name=version;]v$(echo '${{ github.event.pull_request.title }}' | grep -oP 'release v\K[0-9]+\.[0-9]+\.[0-9]+')" - id: extract_version - - - name: Build Release APK - run: | - ./gradlew :app:assembleRelease - - - name: Upload Release Build to Artifacts - uses: actions/upload-artifact@v3 - with: - name: release-artifacts - path: app/build/outputs/apk/release/ - if-no-files-found: error - - - name: Create Github Release - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ steps.extract_version.outputs.version }} - release_name: ${{ steps.extract_version.outputs.version }} - generate_release_notes: true - files: | - app/build/outputs/apk/release/app-release.apk - - - name: Upload artifact to Firebase App Distribution - uses: wzieba/Firebase-Distribution-Github-Action@v1 - with: - appId: ${{secrets.FIREBASE_APP_ID}} - serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} - groups: testers - file: app/build/outputs/apk/release/app-release.apk From 7265265ec1236ceb54b75bd1c2d40da37d8cac9f Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sat, 26 Oct 2024 23:25:55 +0900 Subject: [PATCH 03/10] =?UTF-8?q?[add]=20#312=20Github=20Actions=20?= =?UTF-8?q?=EB=A5=BC=20=ED=99=9C=EC=9A=A9=ED=95=9C=20CD=20=EB=8F=84?= =?UTF-8?q?=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 81 +++++++++++++++++++ .../{pr_checker.yml => winey-ci.yml} | 0 2 files changed, 81 insertions(+) create mode 100644 .github/workflows/winey-cd.yml rename .github/workflows/{pr_checker.yml => winey-ci.yml} (100%) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml new file mode 100644 index 00000000..47a7bfd4 --- /dev/null +++ b/.github/workflows/winey-cd.yml @@ -0,0 +1,81 @@ +# JVM 옵션을 설정, 최대 힙 메모리를 4GB로 +env: + GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false" + GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true +# main 브랜치에 PR을 올릴 시 트리거 +on: + pull_request: + branches: + - develop + +jobs: + cd-build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: 17 + + - name: Generate winey.keystore.jks + run: echo '${{ secrets.WINEY_KEYSTORE }}' | base64 -d > ./app/winey.jks + + - name: Generate local.properties + env: + AUTH_BASE_URL: ${{ secrets.AUTH_BASE_URL }} + KAKAO_NATIVE_KEY: ${{ secrets.KAKAO_NATIVE_KEY }} + AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: | + echo "auth.base.url=$AUTH_BASE_URL" >> ./local.properties + echo "kakao.native.key=$KAKAO_NATIVE_KEY" >> ./local.properties + echo "amplitude.api.key=$AMPLITUDE_API_KEY" >> ./local.properties + echo "kakaoNativeKey=$KAKAO_NATIVE_KEY" >> ./local.properties + echo "keyAlias=$KEY_ALIAS" >> ./local.properties + echo "keyPassword=$KEY_PASSWORD" >> ./local.properties + echo "storePassword=$STORE_PASSWORD" >> ./local.properties + + - name: Generate google-services.json + run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --d > ./app/google-services.json + + # PR 제목에서 release v*.*.* 형식의 버전을 추출 + - name: Extract Version Name + run: echo "##[set-output name=version;]v$(echo '${{ github.event.pull_request.title }}' | grep -oP 'release v\K[0-9]+\.[0-9]+\.[0-9]+')" + id: extract_version + + - name: Build Release APK + run: | + ./gradlew :app:assembleRelease + + # GitHub Actions Artifacts에 릴리즈 apk 추출 + - name: Upload Release Build to Artifacts + uses: actions/upload-artifact@v3 + with: + name: release-artifacts + path: app/build/outputs/apk/release/ + if-no-files-found: error + + - name: Create Github Release + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{ steps.extract_version.outputs.version }} + release_name: ${{ steps.extract_version.outputs.version }} + generate_release_notes: true + files: | + app/build/outputs/apk/release/app-release.apk + + - name: Upload artifact to Firebase App Distribution + uses: wzieba/Firebase-Distribution-Github-Action@v1 + with: + appId: ${{secrets.FIREBASE_APP_ID}} + serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} + groups: testers + file: app/build/outputs/apk/release/app-release.apk diff --git a/.github/workflows/pr_checker.yml b/.github/workflows/winey-ci.yml similarity index 100% rename from .github/workflows/pr_checker.yml rename to .github/workflows/winey-ci.yml From 2a5a3c202c87f7f5b0d949504c6f50ab90b58693 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sun, 27 Oct 2024 15:46:48 +0900 Subject: [PATCH 04/10] =?UTF-8?q?[mod]=20#312=20google-services=20json=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml index 47a7bfd4..e780ebc3 100644 --- a/.github/workflows/winey-cd.yml +++ b/.github/workflows/winey-cd.yml @@ -43,10 +43,13 @@ jobs: echo "keyPassword=$KEY_PASSWORD" >> ./local.properties echo "storePassword=$STORE_PASSWORD" >> ./local.properties - - name: Generate google-services.json - run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --d > ./app/google-services.json + - name: Create Google Services JSON File + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: echo $GOOGLE_SERVICES_JSON > ./app/google-services.json + - # PR 제목에서 release v*.*.* 형식의 버전을 추출 + # PR 제목에서 release v*.*.* 형식의 버전을 추출 - name: Extract Version Name run: echo "##[set-output name=version;]v$(echo '${{ github.event.pull_request.title }}' | grep -oP 'release v\K[0-9]+\.[0-9]+\.[0-9]+')" id: extract_version From f89ebc70e6394d1bb5ba152c1d72d5fa264e6a06 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sun, 27 Oct 2024 15:57:01 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[mod]=20#312=20jdk=20=EC=A3=BC=EC=B2=B4?= =?UTF-8?q?=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml index e780ebc3..e360f886 100644 --- a/.github/workflows/winey-cd.yml +++ b/.github/workflows/winey-cd.yml @@ -2,11 +2,13 @@ env: GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false" GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true -# main 브랜치에 PR을 올릴 시 트리거 +# main, develop 브랜치에 PR을 올릴 시 트리거 on: pull_request: branches: - develop + - main + jobs: cd-build: @@ -19,7 +21,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3 with: - distribution: 'corretto' + distribution: 'temurin' java-version: 17 - name: Generate winey.keystore.jks From 9b02be472977ec3ea623a6209f1a3ee82bcba297 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sun, 27 Oct 2024 16:06:27 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[fix]=20#312=20=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EC=97=B4=EC=9D=84=20=EB=94=B0=EC=98=B4=ED=91=9C=20=EC=95=88?= =?UTF-8?q?=EC=97=90=20=EC=9E=88=EB=8A=94=20=EA=B2=83=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=EC=8B=9D=ED=95=98=EA=B2=8C=20=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EA=B5=AC=EB=AC=B8=20=EC=98=A4=EB=A5=98=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml index e360f886..5faf450f 100644 --- a/.github/workflows/winey-cd.yml +++ b/.github/workflows/winey-cd.yml @@ -35,15 +35,14 @@ jobs: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} run: | - echo "auth.base.url=$AUTH_BASE_URL" >> ./local.properties - echo "kakao.native.key=$KAKAO_NATIVE_KEY" >> ./local.properties - echo "amplitude.api.key=$AMPLITUDE_API_KEY" >> ./local.properties - echo "kakaoNativeKey=$KAKAO_NATIVE_KEY" >> ./local.properties - echo "keyAlias=$KEY_ALIAS" >> ./local.properties - echo "keyPassword=$KEY_PASSWORD" >> ./local.properties - echo "storePassword=$STORE_PASSWORD" >> ./local.properties + echo auth.base.url=\"$AUTH_BASE_URL\" >> ./local.properties + echo kakao.native.key=\"$KAKAO_NATIVE_KEY\" >> ./local.properties + echo amplitude.api.key=\"$AMPLITUDE_API_KEY\" >> ./local.properties + echo kakaoNativeKey=$KAKAO_NATIVE_KEY >> ./local.properties + echo keyAlias=$KEY_ALIAS >> ./local.properties + echo keyPassword=$KEY_PASSWORD >> ./local.properties + echo storePassword=$STORE_PASSWORD >> ./local.properties - name: Create Google Services JSON File env: From 48c55dc25447a502a61ed5be4cb21ad6303810c2 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sun, 27 Oct 2024 16:21:40 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[add]=20#312=20keystore=20jks=20=EC=A1=B4?= =?UTF-8?q?=EC=9E=AC=ED=95=98=EB=8A=94=EC=A7=80=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 70 +++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml index 5faf450f..e578f396 100644 --- a/.github/workflows/winey-cd.yml +++ b/.github/workflows/winey-cd.yml @@ -15,42 +15,52 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 17 + + - name: Generate winey.keystore.jks + run: echo '${{ secrets.WINEY_KEYSTORE }}' | base64 -d > ./app/winey.jks - - name: Generate winey.keystore.jks - run: echo '${{ secrets.WINEY_KEYSTORE }}' | base64 -d > ./app/winey.jks + - name: Check if winey.jks exists + run: | + if [ -f "./app/winey.jks" ]; then + echo "winey.jks file exists in the app directory." + else + echo "Error: winey.jks file is missing in the app directory." >&2 + exit 1 + fi - - name: Generate local.properties - env: - AUTH_BASE_URL: ${{ secrets.AUTH_BASE_URL }} - KAKAO_NATIVE_KEY: ${{ secrets.KAKAO_NATIVE_KEY }} - AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - run: | - echo auth.base.url=\"$AUTH_BASE_URL\" >> ./local.properties - echo kakao.native.key=\"$KAKAO_NATIVE_KEY\" >> ./local.properties - echo amplitude.api.key=\"$AMPLITUDE_API_KEY\" >> ./local.properties - echo kakaoNativeKey=$KAKAO_NATIVE_KEY >> ./local.properties - echo keyAlias=$KEY_ALIAS >> ./local.properties - echo keyPassword=$KEY_PASSWORD >> ./local.properties - echo storePassword=$STORE_PASSWORD >> ./local.properties - - name: Create Google Services JSON File - env: - GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} - run: echo $GOOGLE_SERVICES_JSON > ./app/google-services.json + - name: Generate local.properties + env: + AUTH_BASE_URL: ${{ secrets.AUTH_BASE_URL }} + KAKAO_NATIVE_KEY: ${{ secrets.KAKAO_NATIVE_KEY }} + AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + run: | + echo auth.base.url=\"$AUTH_BASE_URL\" >> ./local.properties + echo kakao.native.key=\"$KAKAO_NATIVE_KEY\" >> ./local.properties + echo amplitude.api.key=\"$AMPLITUDE_API_KEY\" >> ./local.properties + echo kakaoNativeKey=$KAKAO_NATIVE_KEY >> ./local.properties + echo keyAlias=$KEY_ALIAS >> ./local.properties + echo keyPassword=$KEY_PASSWORD >> ./local.properties + echo storePassword=$STORE_PASSWORD >> ./local.properties + + - name: Create Google Services JSON File + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: echo $GOOGLE_SERVICES_JSON > ./app/google-services.json - # PR 제목에서 release v*.*.* 형식의 버전을 추출 + # PR 제목에서 release v*.*.* 형식의 버전을 추출 - name: Extract Version Name run: echo "##[set-output name=version;]v$(echo '${{ github.event.pull_request.title }}' | grep -oP 'release v\K[0-9]+\.[0-9]+\.[0-9]+')" id: extract_version From 56fc2653eec8c9cdbbd6239712c785fb57781c66 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sun, 27 Oct 2024 16:30:52 +0900 Subject: [PATCH 08/10] =?UTF-8?q?[add]=20#312=20keystore=20jks=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml index e578f396..20e2664a 100644 --- a/.github/workflows/winey-cd.yml +++ b/.github/workflows/winey-cd.yml @@ -36,6 +36,9 @@ jobs: exit 1 fi + - name: List keys in winey.jks + run: | + keytool -list -v -keystore ./app/winey.jks -storepass "${{ secrets.STORE_PASSWORD }}" - name: Generate local.properties env: From e855fe1cbcefd0854a3e82d3afbfd0e72e536732 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Sun, 27 Oct 2024 16:48:04 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[add]=20#312=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EA=B6=8C=ED=95=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/winey-cd.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/winey-cd.yml b/.github/workflows/winey-cd.yml index 20e2664a..af1de422 100644 --- a/.github/workflows/winey-cd.yml +++ b/.github/workflows/winey-cd.yml @@ -2,6 +2,7 @@ env: GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false" GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true + # main, develop 브랜치에 PR을 올릴 시 트리거 on: pull_request: @@ -9,6 +10,9 @@ on: - develop - main +# 전체 워크플로우에 대한 권한 설정 +permissions: + contents: write jobs: cd-build: From d5d021806a655ef577a6cf769bc65bb5f28e98f0 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Thu, 31 Oct 2024 22:41:36 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[chore]=20#312=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=EC=BD=94=EB=93=9C,=20=EB=B2=84=EC=A0=84=EB=84=A4=EC=9E=84=20?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/java/DefaultConfig.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/DefaultConfig.kt b/buildSrc/src/main/java/DefaultConfig.kt index 8eda37a4..0bc2951e 100644 --- a/buildSrc/src/main/java/DefaultConfig.kt +++ b/buildSrc/src/main/java/DefaultConfig.kt @@ -3,6 +3,6 @@ object DefaultConfig { const val compileSdk = 33 const val minSdk = 28 const val targetSdk = 33 - const val versionCode = 32 - const val versionName = "1.1.0" + const val versionCode = 33 + const val versionName = "1.1.1" }