From 77765ab9448cde69f10becd2224a22f5e06157ff Mon Sep 17 00:00:00 2001 From: Leehyundong Date: Wed, 20 Nov 2024 00:35:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refact=20::=20git=20submodule=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 --- YouthMap_yml | 1 - src/main/resources/application.yml | 8 +------- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 .gitmodules delete mode 160000 YouthMap_yml diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 18e8cd4..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "YouthMap_yml"] - path = YouthMap_yml - url = https://github.com/hyundong-L/YouthMap_yml.git diff --git a/YouthMap_yml b/YouthMap_yml deleted file mode 160000 index 72e4b35..0000000 --- a/YouthMap_yml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72e4b353f0bc493956942fd576529f8e14521f92 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d7ea673..d3d5aa1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,15 +10,9 @@ spring: config: activate: on-profile: local - import: - - optional:file:YouthMap_yml/application-local.yml - - optional:file:YouthMap_yml/application-common.yml --- spring: config: activate: - on-profile: prod - import: - - optional:file:YouthMap_yml/application-prod.yml - - optional:file:YouthMap_yml/application-common.yml \ No newline at end of file + on-profile: prod \ No newline at end of file From 507323f7acb45d2a63738e2077c8e72ac3dc62dd Mon Sep 17 00:00:00 2001 From: Leehyundong Date: Wed, 20 Nov 2024 00:50:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refact=20::=20deploy.yml=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=97=90=20=EB=B0=B0=ED=8F=AC=20=EC=8B=9C=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=ED=8C=8C=EC=9D=BC=20=EB=B3=B5?= =?UTF-8?q?=EC=82=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aa49886..d34055e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,9 +16,6 @@ jobs: steps: # 깃허브 레포지토리의 코드 체크아웃 - name: Checkout uses: actions/checkout@v4 - with: - token: ${{ secrets.FOR_SUBMODULE_TOKEN }} - submodules: true # JDK 17 설치 - name: Set up JDK 17 @@ -27,6 +24,12 @@ jobs: java-version: '17' distribution: 'temurin' + - name: Make application yml files + run: | + cd ./src/main/resources + echo "${{ secrets.APPLICATION_PROD }}" > ./application-prod.yml + echo "${{ secrets.APPLICATION_COMMON }}" > ./application-common.yml + # Gradle 설정 - name: Setup Gradle uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5