Merge pull request #5 from 9oormthon-univ/hyundong

Hyundong
9oormthon-univ · Nov 19, 2024 · a76a8dc · a76a8dc
2 parents f55ba49 + 507323f
commit a76a8dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git 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

diff --git a/.gitmodules b/.gitmodules
diff --git a/YouthMap_yml b/YouthMap_yml
diff --git 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
+      on-profile: prod