Skip to content

Commit

Permalink
Merge pull request #58 from Princess-in-silvertown/feat/53
Browse files Browse the repository at this point in the history
Chore: 서버 configuration submodule 구성
  • Loading branch information
loveysuby authored Sep 22, 2024
2 parents 4cc7033 + df563f4 commit a724cb2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: read
env:
KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}}
KAKAO_CLIENT_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}}
KAKAO_REDIRECT_URI: ${{secrets.KAKAO_REDIRECT_URI}}

steps:
- name: checkout to develop branch
uses: actions/checkout@v4
with:
token: ${{ secrets.TOYOU_GH_SUBMODULE_TOKEN }}
submodules: true

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### Configuration submodules ###
src/main/resources/application-dev.yml
src/main/resources/application-test.yml
src/main/resources/application-datasource.yml
src/main/resources/application-key.yml


### IntelliJ IDEA ###
.idea
*.iws
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "toyou-server-config"]
path = toyou-server-config
url = [email protected]:Princess-in-silvertown/toyou-server-config.git
branch = main
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security'
}

task copyGitSubmodule(type: Copy) {
copy {
from './toyou-server-config'
include '*.yml'
into './src/main/resources'
}
}

dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"
Expand Down
1 change: 1 addition & 0 deletions toyou-server-config
Submodule toyou-server-config added at 5e48bd

0 comments on commit a724cb2

Please sign in to comment.