From 60bc601bb47123a3e9e77a7d17e16d8800968852 Mon Sep 17 00:00:00 2001 From: dlswns2480 Date: Thu, 29 Aug 2024 00:37:05 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix=20:=20=ED=8F=AC=ED=8A=B8=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/api-deploy.yml | 3 +-- entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/api-deploy.yml b/.github/workflows/api-deploy.yml index 98b5b8b0..26c91425 100644 --- a/.github/workflows/api-deploy.yml +++ b/.github/workflows/api-deploy.yml @@ -6,6 +6,7 @@ on: - feature/db-config - main - develop + - fix/#147 env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -46,8 +47,6 @@ jobs: echo "${{ secrets.APPLICATION_CORE }}" > ./application/src/main/resources/application-core.yml mkdir -p ./adapters/in-web/src/main/resources echo "${{ secrets.APPLICATION_IN_WEB_YML }}" > ./application/src/main/resources/application-in-web.yml - mkdir -p ./adapters/in-batch/src/main/resources - echo "${{ secrets.APPLICATION_IN_BATCH }}" > ./application/src/main/resources/application-in-batch.yml - name: Build with Gradle run: ./gradlew :entry:web:build --no-daemon diff --git a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt index c9accfc4..4ed58ef9 100644 --- a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt +++ b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt @@ -11,6 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling class BatchApplication fun main(args: Array) { - System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-batch") + System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-entry-batch") runApplication(*args) } From 3403cef82076b8fdbadd5b5c08ad23f047cb3c41 Mon Sep 17 00:00:00 2001 From: dlswns2480 Date: Thu, 29 Aug 2024 00:50:33 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix=20:=20=ED=8F=AC=ED=8A=B8=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/batch-deploy.yml | 2 ++ entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/batch-deploy.yml b/.github/workflows/batch-deploy.yml index f3e95f06..def68268 100644 --- a/.github/workflows/batch-deploy.yml +++ b/.github/workflows/batch-deploy.yml @@ -47,6 +47,8 @@ jobs: echo "${{ secrets.APPLICATION_CORE }}" > ./application/src/main/resources/application-core.yml mkdir -p ./adapters/in-batch/src/main/resources echo "${{ secrets.APPLICATION_IN_BATCH_YML }}" > ./application/src/main/resources/application-in-batch.yml + mkdir -p ./adapters/in-batch/src/main/resources + echo "${{ secrets.APPLICATION_IN_BATCH }}" > ./application/src/main/resources/application-in-batch.yml - name: Build with Gradle run: ./gradlew :entry:batch:build --no-daemon diff --git a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt index 4ed58ef9..c9accfc4 100644 --- a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt +++ b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt @@ -11,6 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling class BatchApplication fun main(args: Array) { - System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-entry-batch") + System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-batch") runApplication(*args) } From 083f28a172c57207995418b8eb03cc36da3730b9 Mon Sep 17 00:00:00 2001 From: dlswns2480 Date: Thu, 29 Aug 2024 00:55:01 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix=20:=20=ED=8F=AC=ED=8A=B8=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/batch-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/batch-deploy.yml b/.github/workflows/batch-deploy.yml index def68268..3f6f907c 100644 --- a/.github/workflows/batch-deploy.yml +++ b/.github/workflows/batch-deploy.yml @@ -5,6 +5,7 @@ on: branches: - main - develop + - fix/#147 paths: - 'adapters/in-batch/**' From 624425ddcabc8fc70c12405ff3040b689393f2e7 Mon Sep 17 00:00:00 2001 From: dlswns2480 Date: Thu, 29 Aug 2024 01:09:37 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix=20:=20=ED=8F=AC=ED=8A=B8=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/batch-deploy.yml | 2 +- entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/batch-deploy.yml b/.github/workflows/batch-deploy.yml index 3f6f907c..bdc07825 100644 --- a/.github/workflows/batch-deploy.yml +++ b/.github/workflows/batch-deploy.yml @@ -49,7 +49,7 @@ jobs: mkdir -p ./adapters/in-batch/src/main/resources echo "${{ secrets.APPLICATION_IN_BATCH_YML }}" > ./application/src/main/resources/application-in-batch.yml mkdir -p ./adapters/in-batch/src/main/resources - echo "${{ secrets.APPLICATION_IN_BATCH }}" > ./application/src/main/resources/application-in-batch.yml + echo "${{ secrets.APPLICATION_IN_BATCH }}" > ./adapters/in-batch/src/main/resources/application-adapters-in-batch.yml - name: Build with Gradle run: ./gradlew :entry:batch:build --no-daemon diff --git a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt index c9accfc4..18ac5c15 100644 --- a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt +++ b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt @@ -11,6 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling class BatchApplication fun main(args: Array) { - System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-batch") + System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-batch, application-adapters-in-batch") runApplication(*args) } From 1333c48222b52df191ab18472bd2ed88e3ba3832 Mon Sep 17 00:00:00 2001 From: dlswns2480 Date: Thu, 29 Aug 2024 01:18:00 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix=20:=20=ED=8F=AC=ED=8A=B8=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/batch-deploy.yml | 4 +--- entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/batch-deploy.yml b/.github/workflows/batch-deploy.yml index bdc07825..5a4e84d2 100644 --- a/.github/workflows/batch-deploy.yml +++ b/.github/workflows/batch-deploy.yml @@ -47,9 +47,7 @@ jobs: mkdir -p ./application/src/main/resources echo "${{ secrets.APPLICATION_CORE }}" > ./application/src/main/resources/application-core.yml mkdir -p ./adapters/in-batch/src/main/resources - echo "${{ secrets.APPLICATION_IN_BATCH_YML }}" > ./application/src/main/resources/application-in-batch.yml - mkdir -p ./adapters/in-batch/src/main/resources - echo "${{ secrets.APPLICATION_IN_BATCH }}" > ./adapters/in-batch/src/main/resources/application-adapters-in-batch.yml + echo "${{ secrets.APPLICATION_IN_BATCH_YML }}" > ./adapters/in-batch/src/main/resources/application-in-batch.yml - name: Build with Gradle run: ./gradlew :entry:batch:build --no-daemon diff --git a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt index 18ac5c15..c9accfc4 100644 --- a/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt +++ b/entry/batch/src/main/kotlin/com/pokit/BatchApplication.kt @@ -11,6 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling class BatchApplication fun main(args: Array) { - System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-batch, application-adapters-in-batch") + System.setProperty("spring.config.name", "application-out-web, application-core, application-out-persistence, application-in-batch") runApplication(*args) }