From 27b7c65bdbfc1bbd8e09d50cc63e33c66643cace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:37:04 +0900 Subject: [PATCH 01/10] =?UTF-8?q?fix:=20android.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b36ad833..dfa2c733 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -40,7 +40,10 @@ jobs: run: chmod +x gradlew - name: Create google-services.json - run: echo "$GOOGLE_SERVICES_JSON" > app/google-services.json + run: echo "$GOOGLE_SERVICES_JSON" > app/dev/google-services.json + + - name: Create google-services.json + run: echo "$GOOGLE_SERVICES_JSON" > app/prod/google-services.json - name: Decode and create keystore.jks run: echo $SIGNING_KEY | base64 --decode > app/keystore.jks From a39de7a293414bea9f07b345a8df57ac1fe50f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:40:21 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=08fix:=20android.yml=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index dfa2c733..9abc8816 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -39,12 +39,16 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Create google-services.json - run: echo "$GOOGLE_SERVICES_JSON" > app/dev/google-services.json - - - name: Create google-services.json - run: echo "$GOOGLE_SERVICES_JSON" > app/prod/google-services.json + - name: Create dev directory and copy google-services.json + run: | + mkdir -p app/dev + cp ${{ secrets.GOOGLE_SERVICES_JSON }} app/dev/google-services.json + - name: Create prod directory and copy google-services.json + run: | + mkdir -p app/dev + cp ${{ secrets.GOOGLE_SERVICES_JSON }} app/prod/google-services.json + - name: Decode and create keystore.jks run: echo $SIGNING_KEY | base64 --decode > app/keystore.jks From c1777d2bb1dfd4a234fcb2d09645eddae4a9a367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:44:12 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=08fix:=20android.yml=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9abc8816..efa8f2ab 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -38,16 +38,18 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Create google-services.json dev directory + run: mkdir -p app/dev - - name: Create dev directory and copy google-services.json - run: | - mkdir -p app/dev - cp ${{ secrets.GOOGLE_SERVICES_JSON }} app/dev/google-services.json + - name: Create dev google-services.json + run: echo "$GOOGLE_SERVICES_JSON" > app/dev/google-services.json + + - name: Create google-services.json prod directory + run: mkdir -p app/dev - - name: Create prod directory and copy google-services.json - run: | - mkdir -p app/dev - cp ${{ secrets.GOOGLE_SERVICES_JSON }} app/prod/google-services.json + - name: Create prod google-services.json + run: echo "$GOOGLE_SERVICES_JSON" > app/prod/google-services.json - name: Decode and create keystore.jks run: echo $SIGNING_KEY | base64 --decode > app/keystore.jks From 60a0c84b594f77d052874335d3742ff83560e6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:46:19 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=08fix:=20android.yml=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index efa8f2ab..1a75d418 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -46,7 +46,7 @@ jobs: run: echo "$GOOGLE_SERVICES_JSON" > app/dev/google-services.json - name: Create google-services.json prod directory - run: mkdir -p app/dev + run: mkdir -p app/prod - name: Create prod google-services.json run: echo "$GOOGLE_SERVICES_JSON" > app/prod/google-services.json From b90acec5aed889e57a76bd2fe70dafecb7e24d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:53:15 +0900 Subject: [PATCH 05/10] Update android.yml --- .github/workflows/android.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1a75d418..e11387ca 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -44,6 +44,12 @@ jobs: - name: Create dev google-services.json run: echo "$GOOGLE_SERVICES_JSON" > app/dev/google-services.json + + - name: Create directories for google-services.json + run: mkdir -p app/src/devDebug + + - name: Create google-services.json + run: echo "$GOOGLE_SERVICES_JSON" > app/src/devDebug/google-services.json - name: Create google-services.json prod directory run: mkdir -p app/prod From d833b7c04fe453a787a53306c05b65ff2754466b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:00:58 +0900 Subject: [PATCH 06/10] Update android.yml --- .github/workflows/android.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e11387ca..8a6056be 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -39,23 +39,26 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Create google-services.json dev directory - run: mkdir -p app/dev + - name: Create google-services.json for dev + run: echo "$GOOGLE_SERVICES_JSON" > app/src/dev/google-services.json - - name: Create dev google-services.json - run: echo "$GOOGLE_SERVICES_JSON" > app/dev/google-services.json - - - name: Create directories for google-services.json + - name: Create google-services.json directory for devDebug run: mkdir -p app/src/devDebug - - name: Create google-services.json + - name: Create google-services.json for devDebug run: echo "$GOOGLE_SERVICES_JSON" > app/src/devDebug/google-services.json - - - name: Create google-services.json prod directory - run: mkdir -p app/prod - - name: Create prod google-services.json - run: echo "$GOOGLE_SERVICES_JSON" > app/prod/google-services.json + - name: Create google-services.json directory for prod + run: mkdir -p app/src/prod + + - name: Create google-services.json for prod + run: echo "$GOOGLE_SERVICES_JSON" > app/src/prod/google-services.json + + - name: Create google-services.json directory for prodDebug + run: mkdir -p app/src/prodDebug + + - name: Create google-services.json for prodDebug + run: echo "$GOOGLE_SERVICES_JSON" > app/src/prodDebug/google-services.json - name: Decode and create keystore.jks run: echo $SIGNING_KEY | base64 --decode > app/keystore.jks From 421a69f2c5ded53fd2d2748610b6693ec405c7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:03:17 +0900 Subject: [PATCH 07/10] Update android.yml --- .github/workflows/android.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8a6056be..8cb9dd5e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -38,6 +38,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Create google-services.json directory for dev + run: mkdir -p app/src/dev - name: Create google-services.json for dev run: echo "$GOOGLE_SERVICES_JSON" > app/src/dev/google-services.json From 95caeb6f923caebc787e9d4709c18d4f52080dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:10:11 +0900 Subject: [PATCH 08/10] Update android.yml --- .github/workflows/android.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8cb9dd5e..ef87f6f0 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,6 +13,7 @@ jobs: KEYSTORE_PROPERTIES_CONTENTS: ${{ secrets.KEYSTORE_PROPERTIES_CONTENTS }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} + GOOGLE_SERVICES_JSON_PROD: ${{ secrets.GOOGLE_SERVICES_JSON_PROD }} steps: - uses: actions/checkout@v4 @@ -55,13 +56,13 @@ jobs: run: mkdir -p app/src/prod - name: Create google-services.json for prod - run: echo "$GOOGLE_SERVICES_JSON" > app/src/prod/google-services.json + run: echo "$GOOGLE_SERVICES_JSON_PROD" > app/src/prod/google-services.json - name: Create google-services.json directory for prodDebug run: mkdir -p app/src/prodDebug - name: Create google-services.json for prodDebug - run: echo "$GOOGLE_SERVICES_JSON" > app/src/prodDebug/google-services.json + run: echo "$GOOGLE_SERVICES_JSON_PROD" > app/src/prodDebug/google-services.json - name: Decode and create keystore.jks run: echo $SIGNING_KEY | base64 --decode > app/keystore.jks From 4a542b0159fcf4a104a2238c7ff6960384f5f928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:19:20 +0900 Subject: [PATCH 09/10] Update android.yml --- .github/workflows/android.yml | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ef87f6f0..84f65531 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -43,26 +43,17 @@ jobs: - name: Create google-services.json directory for dev run: mkdir -p app/src/dev - - name: Create google-services.json for dev - run: echo "$GOOGLE_SERVICES_JSON" > app/src/dev/google-services.json + - name: Create google-services.json directory for debug + run: mkdir -p app/src/debug + - name: Create google-services.json for debug + run: echo "$GOOGLE_SERVICES_JSON" > app/src/debug/google-services.json + - name: Create google-services.json directory for devDebug run: mkdir -p app/src/devDebug - name: Create google-services.json for devDebug run: echo "$GOOGLE_SERVICES_JSON" > app/src/devDebug/google-services.json - - - name: Create google-services.json directory for prod - run: mkdir -p app/src/prod - - - name: Create google-services.json for prod - run: echo "$GOOGLE_SERVICES_JSON_PROD" > app/src/prod/google-services.json - - - name: Create google-services.json directory for prodDebug - run: mkdir -p app/src/prodDebug - - - name: Create google-services.json for prodDebug - run: echo "$GOOGLE_SERVICES_JSON_PROD" > app/src/prodDebug/google-services.json - name: Decode and create keystore.jks run: echo $SIGNING_KEY | base64 --decode > app/keystore.jks @@ -75,8 +66,8 @@ jobs: run: | echo "$KEYSTORE_PROPERTIES_CONTENTS" > keystore.properties - - name: Build with Gradle - run: ./gradlew build + # - name: Build with Gradle + # run: ./gradlew build - # - name: Build debug - # run: ./gradlew assembleDebug + - name: Build debug + run: ./gradlew assembleDebug From 54d2606a839f1d9504fc4d930bbb549bbc3d7b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9C=A4?= <65584699+EASYhz@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:29:54 +0900 Subject: [PATCH 10/10] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 84f65531..9870ff11 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -69,5 +69,5 @@ jobs: # - name: Build with Gradle # run: ./gradlew build - - name: Build debug - run: ./gradlew assembleDebug + - name: Build debug with Gradle + run: ./gradlew assembleDevDebug