diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index eaa7a33..3b709df 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -4,7 +4,7 @@ on: branches: - "develop" - "main" - - "infra/https-config" + - "infra/**" pull_request: branches: - "develop" @@ -36,6 +36,7 @@ jobs: ${{ runner.os }}-gradle- - name: Make 'application.yml' +# if: contains(github.ref, 'main') run: | cd ./src/main/resources touch ./application.yml @@ -43,13 +44,11 @@ jobs: cat ./application.yml shell: bash - - name: Make 'application.yml' - if: contains(github.ref, 'main') + - name: Make 'keystore.p12' run: | cd ./src/main/resources - touch ./application.yml - echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./application.yml - cat ./application.yml + touch ./keystore.p12 + echo "${{ secrets.KEYSTORE }}" | base64 --decode > ./keystore.p12 shell: bash - name: Grant execute permission for gradlew diff --git a/.gitignore b/.gitignore index 8e49e3e..258a768 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ build/ !**/src/main/**/build/ !**/src/test/**/build/ application.yml +**/keystore.p12 +**/keystore.p12.base64 + ### IntelliJ IDEA ### .idea diff --git a/src/main/resources/keystore.p12 b/src/main/resources/keystore.p12 deleted file mode 100644 index 2658aa3..0000000 Binary files a/src/main/resources/keystore.p12 and /dev/null differ