From 197992490e2f7e3b0259b407c73b4d3321f7b185 Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 02:50:33 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20GITGUB=20ACTION=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=84=9C=EB=B8=8C=EB=AA=A8=EB=93=88=EC=97=90=20=EC=A0=91?= =?UTF-8?q?=EA=B7=BC=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 17 ++++++++++------- src/main/resources/config | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 8e7a56ca..87e954d4 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -14,6 +14,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + submodules: true + token: ${{ secrets.ACTION_SUBMODULE_TOKEN }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -61,13 +64,13 @@ jobs: run: | echo '${{ secrets.DOCKER_COMPOSE }}' >> docker-compose.yml - - name: Create application.yml - working-directory: ./src/main/resources - env: - APPLICATION_YML: ${{ secrets.APPLICATION_YML }} - run: | - echo '${{ secrets.APPLICATION_YML }}' > application.yml - echo '${{ secrets.APPLICATION_DEPLOY_YML }}' >> application-deploy.yml +# - name: Create application.yml +# working-directory: ./src/main/resources +# env: +# APPLICATION_YML: ${{ secrets.APPLICATION_YML }} +# run: | +# echo '${{ secrets.APPLICATION_YML }}' > application.yml +# echo '${{ secrets.APPLICATION_DEPLOY_YML }}' >> application-deploy.yml - name: Start Containers run: docker-compose -p doo-re up -d diff --git a/src/main/resources/config b/src/main/resources/config index 0df8a126..aa2f268b 160000 --- a/src/main/resources/config +++ b/src/main/resources/config @@ -1 +1 @@ -Subproject commit 0df8a12692fad0abc276f8f6439217fb6b5c2715 +Subproject commit aa2f268bf70ffa312cee5fc9fdd12b7c419e8ba9 From 7e5d9e3253f10c9f2f0e0e97510c45854f67c3e2 Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 03:16:37 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=EC=84=9C=EB=B8=8C=EB=AA=A8=EB=93=88?= =?UTF-8?q?=EC=9D=84=20=EB=AA=BB=20=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 87e954d4..b285fed9 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -17,6 +17,8 @@ jobs: with: submodules: true token: ${{ secrets.ACTION_SUBMODULE_TOKEN }} + run: git submodule update --init --recursive --remote + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -64,13 +66,13 @@ jobs: run: | echo '${{ secrets.DOCKER_COMPOSE }}' >> docker-compose.yml -# - name: Create application.yml -# working-directory: ./src/main/resources -# env: -# APPLICATION_YML: ${{ secrets.APPLICATION_YML }} -# run: | -# echo '${{ secrets.APPLICATION_YML }}' > application.yml -# echo '${{ secrets.APPLICATION_DEPLOY_YML }}' >> application-deploy.yml + # - name: Create application.yml + # working-directory: ./src/main/resources + # env: + # APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + # run: | + # echo '${{ secrets.APPLICATION_YML }}' > application.yml + # echo '${{ secrets.APPLICATION_DEPLOY_YML }}' >> application-deploy.yml - name: Start Containers run: docker-compose -p doo-re up -d From 68c2a396762a59a7436cda8209c5fe5e07896d90 Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 03:20:00 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=EB=AC=B8=EB=B2=95=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index b285fed9..2f4246ef 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -14,10 +14,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + run: | + git submodule update --init --recursive --remote with: submodules: true token: ${{ secrets.ACTION_SUBMODULE_TOKEN }} - run: git submodule update --init --recursive --remote - name: Configure AWS Credentials From ffd3d46a3f68827bcd3087220342718fee5ff38d Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 03:25:57 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20recursive=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 2f4246ef..cdfe962e 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -14,10 +14,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - run: | - git submodule update --init --recursive --remote with: - submodules: true + submodules: recursive token: ${{ secrets.ACTION_SUBMODULE_TOKEN }} From 42d73c4cab00af763a36442fddd5838c4ed682bc Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 04:37:51 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20dev=20yml=EC=9D=84=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 6 ++++-- src/main/resources/config | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index cdfe962e..948de7d9 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -76,13 +76,15 @@ jobs: - name: Start Containers run: docker-compose -p doo-re up -d - - name: Gradle Build & Test + - name: Gradle Cache uses: gradle/gradle-build-action@v2 with: gradle-version: 8.5 - arguments: build cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'ref/heads/develop' }} + - name: Execute Gradle build + run: ./gradlew build -Pprofile=dev + - run: java -Djarmode=layertools -jar build/libs/doore-0.0.1-SNAPSHOT.jar extract - name: Compress diff --git a/src/main/resources/config b/src/main/resources/config index aa2f268b..eeac1608 160000 --- a/src/main/resources/config +++ b/src/main/resources/config @@ -1 +1 @@ -Subproject commit aa2f268bf70ffa312cee5fc9fdd12b7c419e8ba9 +Subproject commit eeac1608f97bdff3c1feb1ada55356a1acb08d1f From ed145e0676a7479481320e1edba6075c23bfd3da Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 04:53:38 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 948de7d9..0c15901b 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -83,7 +83,7 @@ jobs: cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'ref/heads/develop' }} - name: Execute Gradle build - run: ./gradlew build -Pprofile=dev + run: SPRING_PROFILES_ACTIVE=dev ./gradlew build - run: java -Djarmode=layertools -jar build/libs/doore-0.0.1-SNAPSHOT.jar extract From 24eb141a88f469e4cfe384058acaebac93e0b1d3 Mon Sep 17 00:00:00 2001 From: 02ggang9 <02ggang9@gmail.com> Date: Sat, 3 Feb 2024 05:08:48 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20Local=20yml=EC=9D=84=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 0c15901b..18ac70fa 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -83,7 +83,7 @@ jobs: cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'ref/heads/develop' }} - name: Execute Gradle build - run: SPRING_PROFILES_ACTIVE=dev ./gradlew build + run: SPRING_PROFILES_ACTIVE= ./gradlew build - run: java -Djarmode=layertools -jar build/libs/doore-0.0.1-SNAPSHOT.jar extract