From 993221b6ac2207dda05dbb42fbe964544d511742 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 3 Apr 2024 03:09:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20CI=20=EA=B3=BC=EC=A0=95=EC=97=90?= =?UTF-8?q?=EC=84=9C=20application-test.yml=EC=9D=84=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=ED=95=98=EA=B3=A0=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95(#228)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-dev.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 1d47dd9c..27a470cb 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -31,14 +31,18 @@ jobs: # 3) 환경변수 파일 생성 - name: Copy application-local.yml run: | - # application-local.yml 생성 + # application-local.yml, application-test.yml 생성 touch ./src/main/resources/application-local.yml + touch ./src/test/resources/application-test.yml - # application.yaml 파일 값 입력 - echo "${{ secrets.APPLICATION_LOCAL_YML }}" >> ./src/main/resources/application-local.yaml + # application-local.yml, application-test.yml 파일 값 입력 + echo "${{ secrets.APPLICATION_LOCAL_YML }}" >> ./src/main/resources/application-local.yml + echo "${{ secrets.APPLICATION_LOCAL_YML }}" >> ./src/test/resources/application-test.yml - # application.yaml 파일 확인 - cat ./src/main/resources/application-local.yaml + # application-local.yml, application-test.yml 파일 확인 + cat ./src/main/resources/application-local.yml + cat ./src/test/resources/application-test.yml + shell: bash # 이 워크플로우는 gradle build @@ -48,5 +52,5 @@ jobs: - name: Build with Gradle run: | - ./gradlew build -x test + ./gradlew build From 777233d36a938e73ab22cd025ddad5d8aa45be83 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 3 Apr 2024 03:10:46 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20dev=20=ED=99=98=EA=B2=BD=EC=9D=98=20?= =?UTF-8?q?CD=20=EA=B3=BC=EC=A0=95=EC=97=90=EC=84=9C=20application-test.ym?= =?UTF-8?q?l=EC=9D=84=20=EC=83=9D=EC=84=B1=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#228)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-dev-code_deploy.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-dev-code_deploy.yml b/.github/workflows/release-dev-code_deploy.yml index e672e9a3..bc42a9b0 100644 --- a/.github/workflows/release-dev-code_deploy.yml +++ b/.github/workflows/release-dev-code_deploy.yml @@ -5,7 +5,7 @@ on: branches: [ 'dev' ] env: - RESOURCE_PATH: ./src/main/resources/application-local.yaml + RESOURCE_PATH: ./src/main/resources/application-local.yml jobs: build: @@ -28,11 +28,16 @@ jobs: java-version: '17' - name: mkdir resources folder - run: touch ./src/main/resources/application-local.yml + run: | + touch ./src/main/resources/application-local.yml + touch ./src/test/resources/application-test.yml + shell: bash - - name: copy yaml file - run: echo "${{ secrets.APPLICATION_LOCAL_YML }}" > ./src/main/resources/application-local.yml + - name: copy yml file + run: | + echo "${{ secrets.APPLICATION_LOCAL_YML }}" > ./src/main/resources/application-local.yml + echo "${{ secrets.APPLICATION_LOCAL_YML }}" > ./src/test/resources/application-test.yml - name: Grant execute permission for gradlew run: chmod +x gradlew From efbd7d5c92fad2e72f21ad52faf8a2547ab70644 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 3 Apr 2024 03:11:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20prod=20=ED=99=98=EA=B2=BD=EC=9D=98?= =?UTF-8?q?=20CD=20=EA=B3=BC=EC=A0=95=EC=97=90=EC=84=9C=20application-test?= =?UTF-8?q?.yml=EC=9D=84=20=EC=83=9D=EC=84=B1=ED=95=98=EB=8F=84=EB=A1=9D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(#228)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-prod.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 3fc5999f..d58d3442 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -6,7 +6,7 @@ on: tags: [ 'makers-app-develop' ] env: - RESOURCE_PATH: ./src/main/resources/application-prod.yaml + RESOURCE_PATH: ./src/main/resources/application-prod.yml jobs: build: @@ -29,11 +29,15 @@ jobs: java-version: '17' - name: mkdir resources folder - run: touch ./src/main/resources/application-prod.yml + run: | + touch ./src/main/resources/application-prod.yml + touch ./src/test/resources/application-test.yml shell: bash - - name: copy yaml file - run: echo "${{ secrets.APPLICATION_YML }}" > ./src/main/resources/application-prod.yml + - name: copy yml file + run: | + echo "${{ secrets.APPLICATION_YML }}" > ./src/main/resources/application-prod.yml + echo "${{ secrets.APPLICATION_YML }}" > ./src/test/resources/application-test.yml - name: Grant execute permission for gradlew run: chmod +x gradlew