From b3098ed982ef85cfff29e7b1657557251e888cba Mon Sep 17 00:00:00 2001 From: m6z1 Date: Tue, 31 Dec 2024 15:06:27 +0900 Subject: [PATCH 1/6] =?UTF-8?q?build:=20ktlint=20=ED=8F=AC=EB=A7=B7?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..d036dd737 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true + +[*] +charset = utf-8 +insert_final_newline = true +trim_trailing_whitespace = true +ij_kotlin_allow_trailing_comma = true +ij_kotlin_allow_trailing_comma_on_call_site = true From e070b08e924dd8c38df1ef9c0897468bdae5b6a8 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Tue, 31 Dec 2024 15:29:21 +0900 Subject: [PATCH 2/6] =?UTF-8?q?build:=20PR=20CI=20=EB=B9=8C=EB=8D=94=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/WSS_PR_builder.yml | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/WSS_PR_builder.yml diff --git a/.github/workflows/WSS_PR_builder.yml b/.github/workflows/WSS_PR_builder.yml new file mode 100644 index 000000000..8b3b8a64f --- /dev/null +++ b/.github/workflows/WSS_PR_builder.yml @@ -0,0 +1,56 @@ +name: Android CI + +on: + push: + branches: [ "develop", "release", "hotfix" ] + pull_request: + branches: [ "develop", "release", "hotfix" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Cache Gradle + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - 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: Load Google Service file + env: + DATA: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: echo $DATA | base64 -di > app/google-services.json + + - name: Create local.properties + env: + LOCAL_PROPERTIES_CONTENTS: ${{ secrets.LOCAL_PROPERTIES_CONTENTS }} + run: echo "${LOCAL_PROPERTIES_CONTENTS}" > local.properties + + - name: Run Ktlint + uses: ScaCap/action-ktlint@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + android: true + fail_on_error: true + reporter: github-pr-review + + - name: Build with Gradle + run: ./gradlew build From ac0315a2a7dd1346d813ffb83f27002d3ad1f447 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Tue, 31 Dec 2024 15:33:21 +0900 Subject: [PATCH 3/6] =?UTF-8?q?build:=20=EB=A6=B4=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20ci=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/WSS_PR_builder.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/WSS_PR_builder.yml b/.github/workflows/WSS_PR_builder.yml index 8b3b8a64f..bc53f9a2a 100644 --- a/.github/workflows/WSS_PR_builder.yml +++ b/.github/workflows/WSS_PR_builder.yml @@ -2,9 +2,9 @@ name: Android CI on: push: - branches: [ "develop", "release", "hotfix" ] + branches: [ "develop", "release_wss", "release/*", "hotfix" ] pull_request: - branches: [ "develop", "release", "hotfix" ] + branches: [ "develop", "release_wss", "release/*", "hotfix" ] jobs: build: From 8885b2cd3b286e97afeba980950270fea8a191c4 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Tue, 31 Dec 2024 16:09:36 +0900 Subject: [PATCH 4/6] =?UTF-8?q?build:=20local=20properties=20=EC=8B=9C?= =?UTF-8?q?=ED=81=AC=EB=A6=BF=ED=82=A4=20ci=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/WSS_PR_builder.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/WSS_PR_builder.yml b/.github/workflows/WSS_PR_builder.yml index bc53f9a2a..0432eac80 100644 --- a/.github/workflows/WSS_PR_builder.yml +++ b/.github/workflows/WSS_PR_builder.yml @@ -41,8 +41,16 @@ jobs: - name: Create local.properties env: - LOCAL_PROPERTIES_CONTENTS: ${{ secrets.LOCAL_PROPERTIES_CONTENTS }} - run: echo "${LOCAL_PROPERTIES_CONTENTS}" > local.properties + BASE_URL: ${{ secrets.BASE_URL }} + S3_BASE_URL: ${{ secrets.S3_BASE_URL }} + KAKAO_APP_KEY: ${{ secrets.KAKAO_APP_KEY }} + AMPLITUDE_KEY: ${{ secrets.AMPLITUDE_KEY }} + run: | + echo "BASE_URL=${BASE_URL}" >> $GITHUB_ENV + echo "S3_BASE_URL=${S3_BASE_URL}" >> $GITHUB_ENV + echo "KAKAO_APP_KEY=${KAKAO_APP_KEY}" >> $GITHUB_ENV + echo "AMPLITUDE_KEY=${AMPLITUDE_KEY}" >> $GITHUB_ENV + - name: Run Ktlint uses: ScaCap/action-ktlint@master From ad7ad9165ba17579a12670184e26c9defb14aad5 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Tue, 31 Dec 2024 16:10:51 +0900 Subject: [PATCH 5/6] =?UTF-8?q?build:=20=EB=93=A4=EC=97=AC=EC=93=B0?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/WSS_PR_builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/WSS_PR_builder.yml b/.github/workflows/WSS_PR_builder.yml index 0432eac80..c4476f3b0 100644 --- a/.github/workflows/WSS_PR_builder.yml +++ b/.github/workflows/WSS_PR_builder.yml @@ -45,7 +45,7 @@ jobs: S3_BASE_URL: ${{ secrets.S3_BASE_URL }} KAKAO_APP_KEY: ${{ secrets.KAKAO_APP_KEY }} AMPLITUDE_KEY: ${{ secrets.AMPLITUDE_KEY }} - run: | + run: | echo "BASE_URL=${BASE_URL}" >> $GITHUB_ENV echo "S3_BASE_URL=${S3_BASE_URL}" >> $GITHUB_ENV echo "KAKAO_APP_KEY=${KAKAO_APP_KEY}" >> $GITHUB_ENV From 9211b6044e55a4e1db1d9f8e7554253246253399 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Tue, 31 Dec 2024 16:18:54 +0900 Subject: [PATCH 6/6] =?UTF-8?q?build:=20=EB=A1=9C=EC=BB=AC=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=EA=B0=92=20=ED=8F=AC=EB=A7=B7=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/WSS_PR_builder.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/WSS_PR_builder.yml b/.github/workflows/WSS_PR_builder.yml index c4476f3b0..1d6d1ff31 100644 --- a/.github/workflows/WSS_PR_builder.yml +++ b/.github/workflows/WSS_PR_builder.yml @@ -46,10 +46,10 @@ jobs: KAKAO_APP_KEY: ${{ secrets.KAKAO_APP_KEY }} AMPLITUDE_KEY: ${{ secrets.AMPLITUDE_KEY }} run: | - echo "BASE_URL=${BASE_URL}" >> $GITHUB_ENV - echo "S3_BASE_URL=${S3_BASE_URL}" >> $GITHUB_ENV - echo "KAKAO_APP_KEY=${KAKAO_APP_KEY}" >> $GITHUB_ENV - echo "AMPLITUDE_KEY=${AMPLITUDE_KEY}" >> $GITHUB_ENV + echo base.url=\"$BASE_URL\" >> ./local.properties + echo s3.url=\"$S3_BASE_URL\" >> ./local.properties + echo kakao.app.key=\"$KAKAO_APP_KEY\" >> ./local.properties + echo amplitude.key=\"$AMPLITUDE_KEY\" >> ./local.properties - name: Run Ktlint