diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index 8645d300..49cb599d 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -10,7 +10,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + token: ${{ secrets.GIT_SECRET }} + submodules: true - name: Set up JDK 17 uses: actions/setup-java@v3 @@ -18,11 +21,6 @@ jobs: java-version: '17' distribution: 'corretto' - - name: create secret config file - run: | - cd src/main/resources - echo "${{ secrets.APPLICATION_DEV }}" > ./application-dev.yml - - name: build with gradle run: | chmod +x gradlew @@ -46,7 +44,7 @@ jobs: tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DEV_REPONAME }} CD: - needs: [CI] + needs: CI runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index 03336497..9eb88ea9 100644 --- a/.github/workflows/dev-ci.yml +++ b/.github/workflows/dev-ci.yml @@ -10,7 +10,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + token: ${{ secrets.GIT_SECRET }} + submodules: true - name: Set up JDK 17 uses: actions/setup-java@v3 @@ -18,11 +21,6 @@ jobs: java-version: '17' distribution: 'corretto' - - name: create secret config file - run: | - cd src/main/resources - echo "${{ secrets.APPLICATION_DEV }}" > ./application-dev.yml - - name: build with gradle run: | chmod +x gradlew diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..573169e7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "server-yml"] + path = server-yml + url = https://github.com/Team-Hankki/server-yml.git diff --git a/build.gradle b/build.gradle index d8f5889e..59c48be5 100644 --- a/build.gradle +++ b/build.gradle @@ -49,3 +49,11 @@ dependencies { tasks.named('test') { useJUnitPlatform() } + +tasks.register('copyYml', Copy) { + copy { + from './server-yml' + include "*.yml" + into 'src/main/resources' + } +} diff --git a/server-yml b/server-yml new file mode 160000 index 00000000..a7d6b4d4 --- /dev/null +++ b/server-yml @@ -0,0 +1 @@ +Subproject commit a7d6b4d403c4c09d3c0db99b1187d0d8bcc1f850