Merge pull request #141 from Shimpyo-House/develop

feat: 2차 스프린트 기능 구현
Shimpyo-House · Dec 15, 2023 · 108425e · 108425e
2 parents 7bd8f91 + a06537a
commit 108425e
Show file tree

Hide file tree

Showing 175 changed files with 6,483 additions and 1,275 deletions.
diff --git a/.github/workflows/shimpyoDeploy.yml b/.github/workflows/shimpyoDeploy.yml
@@ -23,6 +23,7 @@ jobs:
 
       - name: Make application.properties
         run: |
+          echo "${{ secrets.DEFAULT_PROPERTIES }}" | base64 --decode > src/main/resources/application.yml
           echo "${{ secrets.LOCAL_PROPERTIES }}" | base64 --decode > src/main/resources/application-local.yml
           echo "${{ secrets.PROD_PROPERTIES }}" | base64 --decode > src/main/resources/application-prod.yml
           echo "${{ secrets.TEST_PROPERTIES }}" | base64 --decode > src/test/resources/application.yml

diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ build/
 .settings
 .springBeans
 .sts4-cache
-bin/
+bin/git
 !**/src/main/**/bin/
 !**/src/test/**/bin/
 
@@ -37,7 +37,8 @@ out/
 .vscode/
 
 ### Application.yaml ###
-**/*.yaml
+**/application*.yaml
+**/application*.yml
 
 ### REST Docs Html ###
 **/*.html