From e9664c6d4ad2005f5979e67d08518d912e88aa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:46:48 +0900 Subject: [PATCH 01/51] =?UTF-8?q?refactor:=20BE=20label=20trigger=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index bbebdd1f3..e884cdb4d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,6 +13,7 @@ permissions: jobs: build: + if: contains(github.event.pull_request.labels.*.name, 'BE') runs-on: ubuntu-22.04 permissions: pull-requests: write From c97542fc7f8cbc7ac9b111ef93070525b818efc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:51:16 +0900 Subject: [PATCH 02/51] =?UTF-8?q?style:=20yml=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{gradle.yml => backend-CI-test.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{gradle.yml => backend-CI-test.yml} (100%) diff --git a/.github/workflows/gradle.yml b/.github/workflows/backend-CI-test.yml similarity index 100% rename from .github/workflows/gradle.yml rename to .github/workflows/backend-CI-test.yml From b59ca0abe1a5d12d0b01d2b1215c9a555dbc73e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:29:01 +0900 Subject: [PATCH 03/51] =?UTF-8?q?refactor:=20Secret=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-CI-test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index e884cdb4d..14bd5d62f 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -19,6 +19,11 @@ jobs: pull-requests: write steps: + - name: Access Secrets + env: + google: ${{secrets.GOOGLE}} + kakao: ${{secrets.KAKAO}} + - uses: actions/checkout@v3 - name: Set up JDK 17 From 08425546181ce1e57a01d011c7a962f2b942b8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:31:59 +0900 Subject: [PATCH 04/51] =?UTF-8?q?refactor:=20yml=20secret=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index a5299bfe4..ea138ae47 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -15,19 +15,9 @@ spring: enabled: true oauth2: provider: - google: - client-id: { googleClientId } - client-secret: { googleClientSecret } - redirect-uri: { googleRedirectUri } - token-uri: https://oauth2.googleapis.com/token - user-info: https://www.googleapis.com/oauth2/v2/userinfo - kakao: - client-id: { kakaoClientId } - client-secret: { kakaoClientSecret } - redirect-uri: { kakaoRedirectUri } - token-uri: https://kauth.kakao.com/oauth/token - user-info: https://kapi.kakao.com/v2/user/me - + google: ${GOOGLE} + kakao: ${KAKAO} + logging: level: org: From e2a5f645e617fc977bba3233a3d8f2ea368766eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:39:22 +0900 Subject: [PATCH 05/51] =?UTF-8?q?refactor:=20yml=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index ea138ae47..a78696093 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -15,8 +15,18 @@ spring: enabled: true oauth2: provider: - google: ${GOOGLE} - kakao: ${KAKAO} + google: + client-id: ${ GOOGLE_CLIENT_ID } + client-secret: ${ GOOGLE_CLIENT_SECRET } + redirect-uri: ${ GOOGLE_REDIRECT_URI } + token-uri: ${ GOOGLE_TOKEN_URI } + user-info: ${ GOOGLE_USER_INFO } + kakao: + client-id: ${ KAKAO_CLIENT_ID } + client-secret: ${ KAKAO_CLIENT_SECRET } + redirect-uri: ${ KAKAO_REDIRECT_URI } + token-uri: ${ KAKAO_TOKEN_URI } + user-info: ${ KAKAO_USER_INFO } logging: level: From 85ba4c6580cba76eca40bc435217b6fc5570fda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:47:17 +0900 Subject: [PATCH 06/51] =?UTF-8?q?refactor:=20Secret=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-CI-test.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 14bd5d62f..ff6c6639b 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -21,8 +21,18 @@ jobs: steps: - name: Access Secrets env: - google: ${{secrets.GOOGLE}} - kakao: ${{secrets.KAKAO}} + oauth2.provider.google.client-id: ${{secrets.GOOGLE_CLIENT_ID}} + oauth2.provider.google.client-secret: ${{GOOGLE_CLIENT_SECRET}} + oauth2.provider.google.redirect-uri: ${{GOOGLE_REDIRECT_URI}} + oauth2.provider.google.token-uri: ${{GOOGLE_TOKEN_URI}} + oauth2.provider.google.user-info: ${{GOOGLE_USER_INFO}} + + oauth2.provider.kakao.client-id: ${{KAKAO_CLIENT_ID}} + oauth2.provider.kakao.client-secret: ${{KAKAO_CLIENT_SECRET}} + oauth2.provider.kakao.redirect-uri: ${{KAKAO_REDIRECT_URI}} + oauth2.provider.kakao.token-uri: ${{KAKAO_TOKEN_URI}} + oauth2.provider.kakao.user-info: ${{KAKAO_USER_INFO}} + - uses: actions/checkout@v3 From 9d79af91ca337e7da01755ea73cf270e03e8f8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:50:31 +0900 Subject: [PATCH 07/51] =?UTF-8?q?refactor:=20use=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-CI-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index ff6c6639b..fa90c669b 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -20,6 +20,9 @@ jobs: steps: - name: Access Secrets + uses: microsoft/variable-substitution@v1 + with: + files: ./src/main/resources/application.yml env: oauth2.provider.google.client-id: ${{secrets.GOOGLE_CLIENT_ID}} oauth2.provider.google.client-secret: ${{GOOGLE_CLIENT_SECRET}} From 3c58fbf1a8c3a9f5d07e0ca273b86981e81b2701 Mon Sep 17 00:00:00 2001 From: Ashley Heo Date: Wed, 26 Jul 2023 14:51:17 +0900 Subject: [PATCH 08/51] =?UTF-8?q?refactor:=20Trips=20=ED=8F=B4=EB=8D=94?= =?UTF-8?q?=EB=A5=BC=20trips=EB=A1=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/{Trips => trips}/TripsHeader/TripsHeader.tsx | 0 .../src/components/{Trips => trips}/TripsItem/TripsItem.style.ts | 0 frontend/src/components/{Trips => trips}/TripsItem/TripsItem.tsx | 0 .../components/{Trips => trips}/TripsItem/TripsItemSkeleton.tsx | 0 .../{Trips => trips}/TripsItemList/TripsItemList.style.ts | 0 .../components/{Trips => trips}/TripsItemList/TripsItemList.tsx | 0 .../{Trips => trips}/TripsItemList/TripsItemListSkeleton.tsx | 0 .../{Trips => trips}/TutorialModal/TutorialModal.style.ts | 0 .../components/{Trips => trips}/TutorialModal/TutorialModal.tsx | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename frontend/src/components/{Trips => trips}/TripsHeader/TripsHeader.tsx (100%) rename frontend/src/components/{Trips => trips}/TripsItem/TripsItem.style.ts (100%) rename frontend/src/components/{Trips => trips}/TripsItem/TripsItem.tsx (100%) rename frontend/src/components/{Trips => trips}/TripsItem/TripsItemSkeleton.tsx (100%) rename frontend/src/components/{Trips => trips}/TripsItemList/TripsItemList.style.ts (100%) rename frontend/src/components/{Trips => trips}/TripsItemList/TripsItemList.tsx (100%) rename frontend/src/components/{Trips => trips}/TripsItemList/TripsItemListSkeleton.tsx (100%) rename frontend/src/components/{Trips => trips}/TutorialModal/TutorialModal.style.ts (100%) rename frontend/src/components/{Trips => trips}/TutorialModal/TutorialModal.tsx (100%) diff --git a/frontend/src/components/Trips/TripsHeader/TripsHeader.tsx b/frontend/src/components/trips/TripsHeader/TripsHeader.tsx similarity index 100% rename from frontend/src/components/Trips/TripsHeader/TripsHeader.tsx rename to frontend/src/components/trips/TripsHeader/TripsHeader.tsx diff --git a/frontend/src/components/Trips/TripsItem/TripsItem.style.ts b/frontend/src/components/trips/TripsItem/TripsItem.style.ts similarity index 100% rename from frontend/src/components/Trips/TripsItem/TripsItem.style.ts rename to frontend/src/components/trips/TripsItem/TripsItem.style.ts diff --git a/frontend/src/components/Trips/TripsItem/TripsItem.tsx b/frontend/src/components/trips/TripsItem/TripsItem.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItem/TripsItem.tsx rename to frontend/src/components/trips/TripsItem/TripsItem.tsx diff --git a/frontend/src/components/Trips/TripsItem/TripsItemSkeleton.tsx b/frontend/src/components/trips/TripsItem/TripsItemSkeleton.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItem/TripsItemSkeleton.tsx rename to frontend/src/components/trips/TripsItem/TripsItemSkeleton.tsx diff --git a/frontend/src/components/Trips/TripsItemList/TripsItemList.style.ts b/frontend/src/components/trips/TripsItemList/TripsItemList.style.ts similarity index 100% rename from frontend/src/components/Trips/TripsItemList/TripsItemList.style.ts rename to frontend/src/components/trips/TripsItemList/TripsItemList.style.ts diff --git a/frontend/src/components/Trips/TripsItemList/TripsItemList.tsx b/frontend/src/components/trips/TripsItemList/TripsItemList.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItemList/TripsItemList.tsx rename to frontend/src/components/trips/TripsItemList/TripsItemList.tsx diff --git a/frontend/src/components/Trips/TripsItemList/TripsItemListSkeleton.tsx b/frontend/src/components/trips/TripsItemList/TripsItemListSkeleton.tsx similarity index 100% rename from frontend/src/components/Trips/TripsItemList/TripsItemListSkeleton.tsx rename to frontend/src/components/trips/TripsItemList/TripsItemListSkeleton.tsx diff --git a/frontend/src/components/Trips/TutorialModal/TutorialModal.style.ts b/frontend/src/components/trips/TutorialModal/TutorialModal.style.ts similarity index 100% rename from frontend/src/components/Trips/TutorialModal/TutorialModal.style.ts rename to frontend/src/components/trips/TutorialModal/TutorialModal.style.ts diff --git a/frontend/src/components/Trips/TutorialModal/TutorialModal.tsx b/frontend/src/components/trips/TutorialModal/TutorialModal.tsx similarity index 100% rename from frontend/src/components/Trips/TutorialModal/TutorialModal.tsx rename to frontend/src/components/trips/TutorialModal/TutorialModal.tsx From c5f91eb05ba8608b3fc6800df121ffd6c609e9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:52:35 +0900 Subject: [PATCH 09/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index fa90c669b..6fa3ee09e 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -25,16 +25,16 @@ jobs: files: ./src/main/resources/application.yml env: oauth2.provider.google.client-id: ${{secrets.GOOGLE_CLIENT_ID}} - oauth2.provider.google.client-secret: ${{GOOGLE_CLIENT_SECRET}} - oauth2.provider.google.redirect-uri: ${{GOOGLE_REDIRECT_URI}} - oauth2.provider.google.token-uri: ${{GOOGLE_TOKEN_URI}} - oauth2.provider.google.user-info: ${{GOOGLE_USER_INFO}} + oauth2.provider.google.client-secret: ${{secrets.GOOGLE_CLIENT_SECRET}} + oauth2.provider.google.redirect-uri: ${{secrets.GOOGLE_REDIRECT_URI}} + oauth2.provider.google.token-uri: ${{secrets.GOOGLE_TOKEN_URI}} + oauth2.provider.google.user-info: ${{secrets.GOOGLE_USER_INFO}} - oauth2.provider.kakao.client-id: ${{KAKAO_CLIENT_ID}} - oauth2.provider.kakao.client-secret: ${{KAKAO_CLIENT_SECRET}} - oauth2.provider.kakao.redirect-uri: ${{KAKAO_REDIRECT_URI}} - oauth2.provider.kakao.token-uri: ${{KAKAO_TOKEN_URI}} - oauth2.provider.kakao.user-info: ${{KAKAO_USER_INFO}} + oauth2.provider.kakao.client-id: ${{secrets.KAKAO_CLIENT_ID}} + oauth2.provider.kakao.client-secret: ${{secrets.KAKAO_CLIENT_SECRET}} + oauth2.provider.kakao.redirect-uri: ${{secrets.KAKAO_REDIRECT_URI}} + oauth2.provider.kakao.token-uri: ${{secrets.KAKAO_TOKEN_URI}} + oauth2.provider.kakao.user-info: ${{secrets.KAKAO_USER_INFO}} - uses: actions/checkout@v3 From c79d770d4f8c7d8dac2810392f503456aa7cc79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:00:35 +0900 Subject: [PATCH 10/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 6fa3ee09e..b421fd1c3 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -22,7 +22,7 @@ jobs: - name: Access Secrets uses: microsoft/variable-substitution@v1 with: - files: ./src/main/resources/application.yml + files: ~/backend/src/main/resources/application.yml env: oauth2.provider.google.client-id: ${{secrets.GOOGLE_CLIENT_ID}} oauth2.provider.google.client-secret: ${{secrets.GOOGLE_CLIENT_SECRET}} From a521c7eaaf231bfeac6260c7c9e6029a1f0860ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:05:12 +0900 Subject: [PATCH 11/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index b421fd1c3..d5e4edb5c 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -22,7 +22,7 @@ jobs: - name: Access Secrets uses: microsoft/variable-substitution@v1 with: - files: ~/backend/src/main/resources/application.yml + files: src/main/resources/application.yml env: oauth2.provider.google.client-id: ${{secrets.GOOGLE_CLIENT_ID}} oauth2.provider.google.client-secret: ${{secrets.GOOGLE_CLIENT_SECRET}} From 8fe2670324fb5b4c9a5c2787d09f2974e9063c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:08:44 +0900 Subject: [PATCH 12/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index d5e4edb5c..3be8620f1 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -24,17 +24,17 @@ jobs: with: files: src/main/resources/application.yml env: - oauth2.provider.google.client-id: ${{secrets.GOOGLE_CLIENT_ID}} - oauth2.provider.google.client-secret: ${{secrets.GOOGLE_CLIENT_SECRET}} - oauth2.provider.google.redirect-uri: ${{secrets.GOOGLE_REDIRECT_URI}} - oauth2.provider.google.token-uri: ${{secrets.GOOGLE_TOKEN_URI}} - oauth2.provider.google.user-info: ${{secrets.GOOGLE_USER_INFO}} + GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} + GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} + GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} + GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} + GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} - oauth2.provider.kakao.client-id: ${{secrets.KAKAO_CLIENT_ID}} - oauth2.provider.kakao.client-secret: ${{secrets.KAKAO_CLIENT_SECRET}} - oauth2.provider.kakao.redirect-uri: ${{secrets.KAKAO_REDIRECT_URI}} - oauth2.provider.kakao.token-uri: ${{secrets.KAKAO_TOKEN_URI}} - oauth2.provider.kakao.user-info: ${{secrets.KAKAO_USER_INFO}} + KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} + KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} + KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} + KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} + KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} - uses: actions/checkout@v3 From 00a4ab5abb93e4d6a4f1feb8bb2984ba695ae72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:09:36 +0900 Subject: [PATCH 13/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 3be8620f1..97ca02ad7 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -22,7 +22,7 @@ jobs: - name: Access Secrets uses: microsoft/variable-substitution@v1 with: - files: src/main/resources/application.yml + files: ./src/main/resources/application.yml env: GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} From 640a670bd90c70f933a284206c6e365d45718e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:11:46 +0900 Subject: [PATCH 14/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 97ca02ad7..6811fad1d 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -23,18 +23,18 @@ jobs: uses: microsoft/variable-substitution@v1 with: files: ./src/main/resources/application.yml - env: - GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} - GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} - GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} - GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} - GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} +# env: +# GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} +# GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} +# GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} +# GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} +# GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} - KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} - KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} - KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} - KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} - KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} +# KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} +# KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} +# KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} +# KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} +# KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} - uses: actions/checkout@v3 From 7a9ac529d1372e7a0f394617c4309107004149b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:13:36 +0900 Subject: [PATCH 15/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 6811fad1d..8324b4846 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -19,6 +19,9 @@ jobs: pull-requests: write steps: + - name: Repository Checkout + - uses: actions/checkout@v3 + - name: Access Secrets uses: microsoft/variable-substitution@v1 with: @@ -37,7 +40,7 @@ jobs: # KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} - - uses: actions/checkout@v3 + - name: Set up JDK 17 uses: actions/setup-java@v3 From f9587c55805158b96c6043f06dd4eb5e5ad43cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:14:23 +0900 Subject: [PATCH 16/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 8324b4846..fc71c3a3e 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Repository Checkout - - uses: actions/checkout@v3 + uses: actions/checkout@v3 - name: Access Secrets uses: microsoft/variable-substitution@v1 From 9bd20edea8ffd4deca1724e37d8b0ba278a54c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:15:12 +0900 Subject: [PATCH 17/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index fc71c3a3e..07e0c4ef4 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -25,7 +25,7 @@ jobs: - name: Access Secrets uses: microsoft/variable-substitution@v1 with: - files: ./src/main/resources/application.yml + files: ./backend/src/main/resources/application.yml # env: # GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} # GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} From d9800d2d955ebdca13ff68aab3c67ed91a8c4cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:16:10 +0900 Subject: [PATCH 18/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 07e0c4ef4..cacd0c82d 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -26,18 +26,18 @@ jobs: uses: microsoft/variable-substitution@v1 with: files: ./backend/src/main/resources/application.yml -# env: -# GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} -# GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} -# GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} -# GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} -# GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} + env: + GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} + GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} + GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} + GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} + GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} -# KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} -# KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} -# KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} -# KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} -# KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} + KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} + KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} + KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} + KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} + KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} From 60a68bcfca7b623b038b33f8b08cad0ffc96d500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:25:34 +0900 Subject: [PATCH 19/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index cacd0c82d..f05d09028 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -28,16 +28,16 @@ jobs: files: ./backend/src/main/resources/application.yml env: GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} - GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} - GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} - GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} - GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} +# GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} +# GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} +# GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} +# GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} - KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} - KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} - KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} - KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} - KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} +# KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} +# KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} +# KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} +# KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} +# KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} From dabd26983118486f5aed6ad0c89a44dd426f13e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:27:01 +0900 Subject: [PATCH 20/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index f05d09028..106e933bd 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -27,7 +27,7 @@ jobs: with: files: ./backend/src/main/resources/application.yml env: - GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} + GOOGLE_CLIENT_ID: "sdsaf" # GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} # GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} # GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} From 1dfd385ac8cd54abc5a37e2cd0de8f7f72f6cd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:29:32 +0900 Subject: [PATCH 21/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 106e933bd..56664c5c7 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -21,13 +21,17 @@ jobs: steps: - name: Repository Checkout uses: actions/checkout@v3 + + - name: test + run : | + echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" - - name: Access Secrets - uses: microsoft/variable-substitution@v1 - with: - files: ./backend/src/main/resources/application.yml - env: - GOOGLE_CLIENT_ID: "sdsaf" +# - name: Access Secrets +# uses: microsoft/variable-substitution@v1 +# with: +# files: ./backend/src/main/resources/application.yml +# env: +# GOOGLE_CLIENT_ID: "sdsaf" # GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} # GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} # GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} From afcb5a868afbc054df3c89ee732ab855d8481187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:32:09 +0900 Subject: [PATCH 22/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 56664c5c7..a390571ac 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -26,22 +26,22 @@ jobs: run : | echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" -# - name: Access Secrets -# uses: microsoft/variable-substitution@v1 -# with: -# files: ./backend/src/main/resources/application.yml -# env: -# GOOGLE_CLIENT_ID: "sdsaf" -# GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} -# GOOGLE_REDIRECT_URI: ${{secrets.GOOGLE_REDIRECT_URI}} -# GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}} -# GOOGLE_USER_INFO: ${{secrets.GOOGLE_USER_INFO}} + - name: Access Secrets + uses: microsoft/variable-substitution@v1 + with: + files: ./backend/src/main/resources/application.yml + env: + GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} + GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} + GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} + GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }} + GOOGLE_USER_INFO: ${{ secrets.GOOGLE_USER_INFO }} -# KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}} -# KAKAO_CLINET_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}} -# KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}} -# KAKAO_TOKEN_URI: ${{secrets.KAKAO_TOKEN_URI}} -# KAKAO_USER_INFO: ${{secrets.KAKAO_USER_INFO}} + KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} + KAKAO_CLINET_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} + KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }} + KAKAO_TOKEN_URI: ${{ secrets.KAKAO_TOKEN_URI }} + KAKAO_USER_INFO: ${{ secrets.KAKAO_USER_INFO }} From 618799c4bd6c1e52d7e9581f09cd0da540fad32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:33:08 +0900 Subject: [PATCH 23/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index a390571ac..eb9f9075c 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -30,18 +30,18 @@ jobs: uses: microsoft/variable-substitution@v1 with: files: ./backend/src/main/resources/application.yml - env: - GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} - GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} - GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} - GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }} - GOOGLE_USER_INFO: ${{ secrets.GOOGLE_USER_INFO }} +# env: +# GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} +# GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} +# GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} +# GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }} +# GOOGLE_USER_INFO: ${{ secrets.GOOGLE_USER_INFO }} KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} - KAKAO_CLINET_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} - KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }} - KAKAO_TOKEN_URI: ${{ secrets.KAKAO_TOKEN_URI }} - KAKAO_USER_INFO: ${{ secrets.KAKAO_USER_INFO }} +# KAKAO_CLINET_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} +# KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }} +# KAKAO_TOKEN_URI: ${{ secrets.KAKAO_TOKEN_URI }} +# KAKAO_USER_INFO: ${{ secrets.KAKAO_USER_INFO }} From 4070ffa9fb8208609dcc2866c74fba663f925d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:35:09 +0900 Subject: [PATCH 24/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index eb9f9075c..f00b4d647 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -30,7 +30,7 @@ jobs: uses: microsoft/variable-substitution@v1 with: files: ./backend/src/main/resources/application.yml -# env: + env: # GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} # GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} # GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} From 0fb3110140610afda734e24842f82c5448ad4914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:52:26 +0900 Subject: [PATCH 25/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index f00b4d647..10ac9bd3b 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -24,7 +24,7 @@ jobs: - name: test run : | - echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" + echo "Secrets: ${base64 --decode >{secrets.KAKAO_CLIENT_ID}}" - name: Access Secrets uses: microsoft/variable-substitution@v1 From 141b094c1caacf90ba4c6e0b145786a52c36705e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:53:11 +0900 Subject: [PATCH 26/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 10ac9bd3b..0609f2045 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -24,7 +24,7 @@ jobs: - name: test run : | - echo "Secrets: ${base64 --decode >{secrets.KAKAO_CLIENT_ID}}" + echo "Secrets: base64 --decode > ${{secrets.KAKAO_CLIENT_ID}}" - name: Access Secrets uses: microsoft/variable-substitution@v1 From 65fd483bb8504970ad8aa3163546622a0fd8b955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:54:51 +0900 Subject: [PATCH 27/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 0609f2045..a665beba0 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -24,7 +24,7 @@ jobs: - name: test run : | - echo "Secrets: base64 --decode > ${{secrets.KAKAO_CLIENT_ID}}" + echo "Secrets: ${{base64 --decode > secrets.KAKAO_CLIENT_ID}}" - name: Access Secrets uses: microsoft/variable-substitution@v1 From c6e4a184535f9173361ce7ae56ef534c2c7a6713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:55:57 +0900 Subject: [PATCH 28/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index a665beba0..f00b4d647 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -24,7 +24,7 @@ jobs: - name: test run : | - echo "Secrets: ${{base64 --decode > secrets.KAKAO_CLIENT_ID}}" + echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" - name: Access Secrets uses: microsoft/variable-substitution@v1 From 122a85590b10af1adbccd05c94a3c2b650254541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:59:13 +0900 Subject: [PATCH 29/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index f00b4d647..d633bc6b7 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -26,18 +26,18 @@ jobs: run : | echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" - - name: Access Secrets - uses: microsoft/variable-substitution@v1 - with: - files: ./backend/src/main/resources/application.yml - env: +# - name: Access Secrets +# uses: microsoft/variable-substitution@v1 +# with: +# files: ./backend/src/main/resources/application.yml +# env: # GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} # GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} # GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} # GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }} # GOOGLE_USER_INFO: ${{ secrets.GOOGLE_USER_INFO }} - KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} +# KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} # KAKAO_CLINET_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} # KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }} # KAKAO_TOKEN_URI: ${{ secrets.KAKAO_TOKEN_URI }} From 8cdff851f46710259a5fc0c69504f45f7f063278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:09:09 +0900 Subject: [PATCH 30/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index d633bc6b7..3e32abc81 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -31,17 +31,17 @@ jobs: # with: # files: ./backend/src/main/resources/application.yml # env: -# GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} -# GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} -# GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} -# GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }} -# GOOGLE_USER_INFO: ${{ secrets.GOOGLE_USER_INFO }} +# GOOGLE_CLIENT_ID: ${ {secrets.GOOGLE_CLIENT_ID } } +# GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET } } +# GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI } } +# GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI } } +# GOOGLE_USER_INFO: ${ {secrets.GOOGLE_USER_INFO } } -# KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} -# KAKAO_CLINET_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} -# KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }} -# KAKAO_TOKEN_URI: ${{ secrets.KAKAO_TOKEN_URI }} -# KAKAO_USER_INFO: ${{ secrets.KAKAO_USER_INFO }} +# KAKAO_CLIENT_ID: ${ {secrets.KAKAO_CLIENT_ID} } +# KAKAO_CLINET_SECRET: ${ {secrets.KAKAO_CLIENT_SECRET} } +# KAKAO_REDIRECT_URI: ${ {secrets.KAKAO_REDIRECT_URI} } +# KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } +# KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } From c2b459cc0ed9f997b89044ada4d242db4c03127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:10:58 +0900 Subject: [PATCH 31/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 3e32abc81..f6cdcb585 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -26,22 +26,22 @@ jobs: run : | echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" -# - name: Access Secrets -# uses: microsoft/variable-substitution@v1 -# with: -# files: ./backend/src/main/resources/application.yml -# env: -# GOOGLE_CLIENT_ID: ${ {secrets.GOOGLE_CLIENT_ID } } -# GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET } } -# GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI } } -# GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI } } -# GOOGLE_USER_INFO: ${ {secrets.GOOGLE_USER_INFO } } + - name: Access Secrets + uses: microsoft/variable-substitution@v1 + with: + files: ./backend/src/main/resources/application.yml + env: + GOOGLE_CLIENT_ID: ${ {secrets.GOOGLE_CLIENT_ID} } + GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET} } + GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI} } + GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI} } + GOOGLE_USER_INFO: ${ {secrets.GOOGLE_USER_INFO} } -# KAKAO_CLIENT_ID: ${ {secrets.KAKAO_CLIENT_ID} } -# KAKAO_CLINET_SECRET: ${ {secrets.KAKAO_CLIENT_SECRET} } -# KAKAO_REDIRECT_URI: ${ {secrets.KAKAO_REDIRECT_URI} } -# KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } -# KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } + KAKAO_CLIENT_ID: ${ {secrets.KAKAO_CLIENT_ID} } + KAKAO_CLINET_SECRET: ${ {secrets.KAKAO_CLIENT_SECRET} } + KAKAO_REDIRECT_URI: ${ {secrets.KAKAO_REDIRECT_URI} } + KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } + KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } From 2ce8e7aff015c8972c29499d4f7910767f3022f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:26:17 +0900 Subject: [PATCH 32/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index f6cdcb585..57f524b11 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -31,7 +31,7 @@ jobs: with: files: ./backend/src/main/resources/application.yml env: - GOOGLE_CLIENT_ID: ${ {secrets.GOOGLE_CLIENT_ID} } + GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET} } GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI} } GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI} } From 66ec21322347f658b75d7eb9e044e293903ea6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:40:47 +0900 Subject: [PATCH 33/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 35 +++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 57f524b11..87a87869e 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -26,23 +26,26 @@ jobs: run : | echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" - - name: Access Secrets - uses: microsoft/variable-substitution@v1 - with: - files: ./backend/src/main/resources/application.yml - env: - GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} - GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET} } - GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI} } - GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI} } - GOOGLE_USER_INFO: ${ {secrets.GOOGLE_USER_INFO} } - - KAKAO_CLIENT_ID: ${ {secrets.KAKAO_CLIENT_ID} } - KAKAO_CLINET_SECRET: ${ {secrets.KAKAO_CLIENT_SECRET} } - KAKAO_REDIRECT_URI: ${ {secrets.KAKAO_REDIRECT_URI} } - KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } - KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } +# - name: Access Secrets +# uses: microsoft/variable-substitution@v1 +# with: +# files: ./backend/src/main/resources/application.yml +# env: +# GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} +# GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET} } +# GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI} } +# GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI} } +# GOOGLE_USER_INFO: ${ {secrets.GOOGLE_USER_INFO} } +# KAKAO_CLIENT_ID: ${ {secrets.KAKAO_CLIENT_ID} } +# KAKAO_CLINET_SECRET: ${ {secrets.KAKAO_CLIENT_SECRET} } +# KAKAO_REDIRECT_URI: ${ {secrets.KAKAO_REDIRECT_URI} } +# KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } +# KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } + - name: test2 + env: + APPLICAION_YML: ${{ secrets.APPLICATION_YML }} + run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application.yml From bc792dc46f73f8201b6c3b65254bbd7acbd0882f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:48:26 +0900 Subject: [PATCH 34/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 87a87869e..819f0cfa3 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -45,7 +45,7 @@ jobs: - name: test2 env: APPLICAION_YML: ${{ secrets.APPLICATION_YML }} - run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application.yml + run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application_dev.yml @@ -64,7 +64,10 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - + + - name: Build with Custom YAML + run: application_dev.yml ./src/main/resources/application_dev.yml + - name: chmod gradlew run: chmod +x gradlew From a7212563b1fa80a14a2d8ca45a49ad3902615247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:53:35 +0900 Subject: [PATCH 35/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 819f0cfa3..9015a5cb0 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -55,24 +55,24 @@ jobs: java-version: '17' distribution: 'corretto' - - name: cache gradle - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- +# - name: cache gradle +# uses: actions/cache@v2 +# with: +# path: | +# ~/.gradle/caches +# ~/.gradle/wrapper +# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} +# restore-keys: | +# ${{ runner.os }}-gradle- - - name: Build with Custom YAML - run: application_dev.yml ./src/main/resources/application_dev.yml +# - name: Build with Custom YAML +# run: application_dev.yml ./src/main/resources/application_dev.yml - name: chmod gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build + run: ./gradlew devbuild - name: Run Coverage run: ./gradlew test From 849ee61e902691633231a07aa52e7471a18531f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:56:25 +0900 Subject: [PATCH 36/51] Update build.gradle --- backend/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/build.gradle b/backend/build.gradle index 4442fc017..c1849c882 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -77,3 +77,8 @@ tasks.register('copyApiDocument', Copy) { build { dependsOn copyApiDocument } + +task devBuild(type: Exec) { + workingDir '.' + commandLine './gradlew', 'build', '--spring.config.location=src/main/resources/application_dev.yml' +} From 55c729c1c717b92e0f1748bc81bcbb34e2a919a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:07:11 +0900 Subject: [PATCH 37/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 9015a5cb0..bc57187ec 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -45,7 +45,7 @@ jobs: - name: test2 env: APPLICAION_YML: ${{ secrets.APPLICATION_YML }} - run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application_dev.yml + run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application-dev.yml @@ -66,7 +66,7 @@ jobs: # ${{ runner.os }}-gradle- # - name: Build with Custom YAML -# run: application_dev.yml ./src/main/resources/application_dev.yml +# run: application-dev.yml ./src/main/resources/application-dev.yml - name: chmod gradlew run: chmod +x gradlew From 7da7edf4bfdbb3fbe72d231a276f2dba6a6f9a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:07:16 +0900 Subject: [PATCH 38/51] Update build.gradle --- backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index c1849c882..71e817c40 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -80,5 +80,5 @@ build { task devBuild(type: Exec) { workingDir '.' - commandLine './gradlew', 'build', '--spring.config.location=src/main/resources/application_dev.yml' + commandLine './gradlew', 'build', '--spring.config.location=src/main/resources/application-dev.yml' } From 8b6fc3e3b054d18c52951d86895a14b78f182c5f Mon Sep 17 00:00:00 2001 From: jjongwa Date: Wed, 26 Jul 2023 17:13:55 +0900 Subject: [PATCH 39/51] test --- .../src/main/resources/application-local.yml | 38 ++++++++++++++++++ backend/src/main/resources/application.yml | 39 +------------------ 2 files changed, 40 insertions(+), 37 deletions(-) create mode 100644 backend/src/main/resources/application-local.yml diff --git a/backend/src/main/resources/application-local.yml b/backend/src/main/resources/application-local.yml new file mode 100644 index 000000000..da5fc9446 --- /dev/null +++ b/backend/src/main/resources/application-local.yml @@ -0,0 +1,38 @@ +spring: + jpa: + hibernate: + ddl-auto: none + properties: + hibernate.format_sql: true + show-sql: true + open-in-view: false + datasource: + url: jdbc:h2:mem:testdb;MODE=MySQL + username: sa + driver-class-name: org.h2.Driver + h2: + console: + enabled: true +oauth2: + provider: + google: + client-id: ${ GOOGLE_CLIENT_ID } + client-secret: ${ GOOGLE_CLIENT_SECRET } + redirect-uri: ${ GOOGLE_REDIRECT_URI } + token-uri: ${ GOOGLE_TOKEN_URI } + user-info: ${ GOOGLE_USER_INFO } + kakao: + client-id: ${ KAKAO_CLIENT_ID } + client-secret: ${ KAKAO_CLIENT_SECRET } + redirect-uri: ${ KAKAO_REDIRECT_URI } + token-uri: ${ KAKAO_TOKEN_URI } + user-info: ${ KAKAO_USER_INFO } + +logging: + level: + org: + hibernate: + type: + descriptor: + sql: + BasicBinder: TRACE diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index a5299bfe4..3d7808a0c 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,38 +1,3 @@ spring: - jpa: - hibernate: - ddl-auto: none - properties: - hibernate.format_sql: true - show-sql: true - open-in-view: false - datasource: - url: jdbc:h2:mem:testdb;MODE=MySQL - username: sa - driver-class-name: org.h2.Driver - h2: - console: - enabled: true -oauth2: - provider: - google: - client-id: { googleClientId } - client-secret: { googleClientSecret } - redirect-uri: { googleRedirectUri } - token-uri: https://oauth2.googleapis.com/token - user-info: https://www.googleapis.com/oauth2/v2/userinfo - kakao: - client-id: { kakaoClientId } - client-secret: { kakaoClientSecret } - redirect-uri: { kakaoRedirectUri } - token-uri: https://kauth.kakao.com/oauth/token - user-info: https://kapi.kakao.com/v2/user/me - -logging: - level: - org: - hibernate: - type: - descriptor: - sql: - BasicBinder: TRACE + profiles: + active: dev From bc24bc2e9ddd8b5dc17320a924deb05406dbbbcd Mon Sep 17 00:00:00 2001 From: jjongwa Date: Wed, 26 Jul 2023 17:16:05 +0900 Subject: [PATCH 40/51] test --- backend/src/main/resources/application.yml | 39 ++-------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index a78696093..3d7808a0c 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,38 +1,3 @@ spring: - jpa: - hibernate: - ddl-auto: none - properties: - hibernate.format_sql: true - show-sql: true - open-in-view: false - datasource: - url: jdbc:h2:mem:testdb;MODE=MySQL - username: sa - driver-class-name: org.h2.Driver - h2: - console: - enabled: true -oauth2: - provider: - google: - client-id: ${ GOOGLE_CLIENT_ID } - client-secret: ${ GOOGLE_CLIENT_SECRET } - redirect-uri: ${ GOOGLE_REDIRECT_URI } - token-uri: ${ GOOGLE_TOKEN_URI } - user-info: ${ GOOGLE_USER_INFO } - kakao: - client-id: ${ KAKAO_CLIENT_ID } - client-secret: ${ KAKAO_CLIENT_SECRET } - redirect-uri: ${ KAKAO_REDIRECT_URI } - token-uri: ${ KAKAO_TOKEN_URI } - user-info: ${ KAKAO_USER_INFO } - -logging: - level: - org: - hibernate: - type: - descriptor: - sql: - BasicBinder: TRACE + profiles: + active: dev From d79d726851005efab920d1df0e207ce58552c260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:17:40 +0900 Subject: [PATCH 41/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index bc57187ec..0b4b1d078 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -72,7 +72,7 @@ jobs: run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew devbuild + run: ./gradlew build - name: Run Coverage run: ./gradlew test From fb3147bd67b6b6fca383313301d91ba7aab84fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:36:55 +0900 Subject: [PATCH 42/51] Update build.gradle --- backend/build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 71e817c40..4442fc017 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -77,8 +77,3 @@ tasks.register('copyApiDocument', Copy) { build { dependsOn copyApiDocument } - -task devBuild(type: Exec) { - workingDir '.' - commandLine './gradlew', 'build', '--spring.config.location=src/main/resources/application-dev.yml' -} From 5c90546bbe52ea7cd714c99f950777d347a4862d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:44:53 +0900 Subject: [PATCH 43/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 0b4b1d078..779de48bc 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -47,7 +47,8 @@ jobs: APPLICAION_YML: ${{ secrets.APPLICATION_YML }} run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application-dev.yml - + - name: test3 + run: cat ./src/main/resources/application-dev.yml - name: Set up JDK 17 uses: actions/setup-java@v3 From 09f5c86ee665bd90f55abcd8307b1a1c2246f8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:14:26 +0900 Subject: [PATCH 44/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 779de48bc..5697ca193 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -44,7 +44,7 @@ jobs: # KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } - name: test2 env: - APPLICAION_YML: ${{ secrets.APPLICATION_YML }} + APPLICATION_YML: ${{ secrets.APPLICATION_YML }} run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application-dev.yml - name: test3 From dfabaa6d28603c151bcc80939e0a8796d3fcbec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:21:03 +0900 Subject: [PATCH 45/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 5697ca193..aa1af75e9 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -45,7 +45,7 @@ jobs: - name: test2 env: APPLICATION_YML: ${{ secrets.APPLICATION_YML }} - run: echo $APPLICATION_YML | base64 --decode > ./src/main/resources/application-dev.yml + run: echo $APPLICATION_YML | base64 --decode >> ./src/main/resources/application-dev.yml - name: test3 run: cat ./src/main/resources/application-dev.yml From 6c3bb070003eee02ef2ab255ae1147553bec786b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:39:02 +0900 Subject: [PATCH 46/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index aa1af75e9..b8be1bc19 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -43,9 +43,7 @@ jobs: # KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } # KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } - name: test2 - env: - APPLICATION_YML: ${{ secrets.APPLICATION_YML }} - run: echo $APPLICATION_YML | base64 --decode >> ./src/main/resources/application-dev.yml + run: echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./src/main/resources/application-dev.yml - name: test3 run: cat ./src/main/resources/application-dev.yml From 770cc0f40ea1aa118f99d821e8a84e49a407b3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:41:47 +0900 Subject: [PATCH 47/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index b8be1bc19..88e6615a4 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -22,9 +22,9 @@ jobs: - name: Repository Checkout uses: actions/checkout@v3 - - name: test - run : | - echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" +# - name: test +# run : | +# echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" # - name: Access Secrets # uses: microsoft/variable-substitution@v1 From 0e207291e789cc8439475b31c57a96fa07cf3b63 Mon Sep 17 00:00:00 2001 From: jjongwa Date: Wed, 26 Jul 2023 20:50:32 +0900 Subject: [PATCH 48/51] =?UTF-8?q?refactor:=20application.yml=20=ED=86=B5?= =?UTF-8?q?=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/build.gradle | 5 --- .../src/main/resources/application-local.yml | 38 ------------------ backend/src/main/resources/application.yml | 39 ++++++++++++++++++- 3 files changed, 37 insertions(+), 45 deletions(-) delete mode 100644 backend/src/main/resources/application-local.yml diff --git a/backend/build.gradle b/backend/build.gradle index 71e817c40..4442fc017 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -77,8 +77,3 @@ tasks.register('copyApiDocument', Copy) { build { dependsOn copyApiDocument } - -task devBuild(type: Exec) { - workingDir '.' - commandLine './gradlew', 'build', '--spring.config.location=src/main/resources/application-dev.yml' -} diff --git a/backend/src/main/resources/application-local.yml b/backend/src/main/resources/application-local.yml deleted file mode 100644 index da5fc9446..000000000 --- a/backend/src/main/resources/application-local.yml +++ /dev/null @@ -1,38 +0,0 @@ -spring: - jpa: - hibernate: - ddl-auto: none - properties: - hibernate.format_sql: true - show-sql: true - open-in-view: false - datasource: - url: jdbc:h2:mem:testdb;MODE=MySQL - username: sa - driver-class-name: org.h2.Driver - h2: - console: - enabled: true -oauth2: - provider: - google: - client-id: ${ GOOGLE_CLIENT_ID } - client-secret: ${ GOOGLE_CLIENT_SECRET } - redirect-uri: ${ GOOGLE_REDIRECT_URI } - token-uri: ${ GOOGLE_TOKEN_URI } - user-info: ${ GOOGLE_USER_INFO } - kakao: - client-id: ${ KAKAO_CLIENT_ID } - client-secret: ${ KAKAO_CLIENT_SECRET } - redirect-uri: ${ KAKAO_REDIRECT_URI } - token-uri: ${ KAKAO_TOKEN_URI } - user-info: ${ KAKAO_USER_INFO } - -logging: - level: - org: - hibernate: - type: - descriptor: - sql: - BasicBinder: TRACE diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 3d7808a0c..da5fc9446 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,3 +1,38 @@ spring: - profiles: - active: dev + jpa: + hibernate: + ddl-auto: none + properties: + hibernate.format_sql: true + show-sql: true + open-in-view: false + datasource: + url: jdbc:h2:mem:testdb;MODE=MySQL + username: sa + driver-class-name: org.h2.Driver + h2: + console: + enabled: true +oauth2: + provider: + google: + client-id: ${ GOOGLE_CLIENT_ID } + client-secret: ${ GOOGLE_CLIENT_SECRET } + redirect-uri: ${ GOOGLE_REDIRECT_URI } + token-uri: ${ GOOGLE_TOKEN_URI } + user-info: ${ GOOGLE_USER_INFO } + kakao: + client-id: ${ KAKAO_CLIENT_ID } + client-secret: ${ KAKAO_CLIENT_SECRET } + redirect-uri: ${ KAKAO_REDIRECT_URI } + token-uri: ${ KAKAO_TOKEN_URI } + user-info: ${ KAKAO_USER_INFO } + +logging: + level: + org: + hibernate: + type: + descriptor: + sql: + BasicBinder: TRACE From 8da93e4eb851c17c2393165e8858cd35454196e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:52:10 +0900 Subject: [PATCH 49/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 28 +-------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 88e6615a4..66b2a4b3d 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -22,31 +22,8 @@ jobs: - name: Repository Checkout uses: actions/checkout@v3 -# - name: test -# run : | -# echo "Secrets: ${{secrets.KAKAO_CLIENT_ID}}" - -# - name: Access Secrets -# uses: microsoft/variable-substitution@v1 -# with: -# files: ./backend/src/main/resources/application.yml -# env: -# GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} -# GOOGLE_CLIENT_SECRET: ${ {secrets.GOOGLE_CLIENT_SECRET} } -# GOOGLE_REDIRECT_URI: ${ {secrets.GOOGLE_REDIRECT_URI} } -# GOOGLE_TOKEN_URI: ${ {secrets.GOOGLE_TOKEN_URI} } -# GOOGLE_USER_INFO: ${ {secrets.GOOGLE_USER_INFO} } - -# KAKAO_CLIENT_ID: ${ {secrets.KAKAO_CLIENT_ID} } -# KAKAO_CLINET_SECRET: ${ {secrets.KAKAO_CLIENT_SECRET} } -# KAKAO_REDIRECT_URI: ${ {secrets.KAKAO_REDIRECT_URI} } -# KAKAO_TOKEN_URI: ${ {secrets.KAKAO_TOKEN_URI} } -# KAKAO_USER_INFO: ${ {secrets.KAKAO_USER_INFO} } - name: test2 - run: echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./src/main/resources/application-dev.yml - - - name: test3 - run: cat ./src/main/resources/application-dev.yml + run: echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./src/main/resources/application.yml - name: Set up JDK 17 uses: actions/setup-java@v3 @@ -64,9 +41,6 @@ jobs: # restore-keys: | # ${{ runner.os }}-gradle- -# - name: Build with Custom YAML -# run: application-dev.yml ./src/main/resources/application-dev.yml - - name: chmod gradlew run: chmod +x gradlew From baf8292eeb3428e5869e5c075c215fe87a87ff97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:58:36 +0900 Subject: [PATCH 50/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 30 +++++++++------------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 66b2a4b3d..3c75f6d4f 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -19,44 +19,34 @@ jobs: pull-requests: write steps: - - name: Repository Checkout + - name: 레포지토리 체크아웃 uses: actions/checkout@v3 - - name: test2 + - name: dev 전용 application.yml을 Secret에서 복사해옵니다. run: echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./src/main/resources/application.yml - - name: Set up JDK 17 + - name: JDK 17을 설치합니다. uses: actions/setup-java@v3 with: java-version: '17' distribution: 'corretto' - -# - name: cache gradle -# uses: actions/cache@v2 -# with: -# path: | -# ~/.gradle/caches -# ~/.gradle/wrapper -# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} -# restore-keys: | -# ${{ runner.os }}-gradle- - - name: chmod gradlew + - name: gradlew 권한을 부여합니다. run: chmod +x gradlew - - name: Build with Gradle + - name: Gradle을 통해 빌드합니다. run: ./gradlew build - - name: Run Coverage - run: ./gradlew test +# - name: Run Coverage +# run: ./gradlew test - - name: run jacocoTestCoverage + - name: jacocoTestCoverage를 실행하고 리포트를 출력합니다. id: jacoco uses: madrapps/jacoco-report@v1.5 with: title: 📝 Jacoco Test Coverage paths: ${{ github.workspace }}/**/build/reports/jacoco/test/jacocoTestReport.xml token: ${{ secrets.GITHUB_TOKEN }} - min-coverage-overall: 85 - min-coverage-changed-files: 85 + min-coverage-overall: 80 + min-coverage-changed-files: 80 update-comment: true From c43e48ce612f2240b25faec23421f545279e273a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=A2=85=ED=99=94?= <77482065+jjongwa@users.noreply.github.com> Date: Wed, 26 Jul 2023 21:01:42 +0900 Subject: [PATCH 51/51] Update backend-CI-test.yml --- .github/workflows/backend-CI-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/backend-CI-test.yml b/.github/workflows/backend-CI-test.yml index 3c75f6d4f..666314de4 100644 --- a/.github/workflows/backend-CI-test.yml +++ b/.github/workflows/backend-CI-test.yml @@ -37,9 +37,6 @@ jobs: - name: Gradle을 통해 빌드합니다. run: ./gradlew build -# - name: Run Coverage -# run: ./gradlew test - - name: jacocoTestCoverage를 실행하고 리포트를 출력합니다. id: jacoco uses: madrapps/jacoco-report@v1.5