From ab812880e591d904992679f061f22987cdc97b6f Mon Sep 17 00:00:00 2001 From: Jiyun <112507402+kjiyun@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:46:18 +0900 Subject: [PATCH 01/28] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cce4bc..b1e5a8d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ kahluaproject Spring Boot version **KAHLUA BAND website** Backend using SpringBoot ## 프로젝트 소개 -아~ 우리는 깔!깔!깔!깔루아!! 저희는 홍익대학교 컴퓨터공학과 밴드부 깔루아입니다. +아~ 우리는 깔!깔!깔!깔루아!! 저희는 밴드부 깔루아입니다. 매년 정기 공연을 진행하면서 공연 참석 희망자 수요 조사만 진행하고 현장예매로 티켓을 판매하였습니다. 이에 따라 수요 조사가 정확하지 않다는 단점도 있었고 현장 예매에 많은 시간이 소모된다는 단점이 존재했습니다. From f8d2985ea2ecc5b9337327c4ab2af0ab1632f803 Mon Sep 17 00:00:00 2001 From: Jiyun <112507402+kjiyun@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:53:27 +0900 Subject: [PATCH 02/28] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b1e5a8d..8ef12b1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Homepage_BE_SpringBoot -kahluaproject Spring Boot version +### Kahluaproject Spring Boot version + + -![Kahlua (1)](https://github.com/kahluaband/Homepage_FE_20th/assets/109282927/0dc8d6f6-08e0-4339-ab41-a0adf53e2b0a) 🧷 https://kahluaband.com # KAHLUA_BE From 41c701861f6a3684cdd1b15106993a84d56b51b8 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 17:50:45 +0900 Subject: [PATCH 03/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20ci=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 18 ++++++++++++++++++ .../KahluaProject/DemoApplicationTests.java | 4 ---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/spring-ci.yml diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml new file mode 100644 index 0000000..b4056ad --- /dev/null +++ b/.github/workflows/spring-ci.yml @@ -0,0 +1,18 @@ +name: Spring Boot & Gradle CI + +on: + pull_request: + push: + branches: [ "main" ] + +jobs: + ci: + uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-ci-standard.yml@eb9496c + with: + java-version: "17" + distribution: "temurin" + build-command: "false" + test-command: "false" + upload-artifacts: true + secrets: + APPLICATION: ${{ secrets.APPLICATION }} \ No newline at end of file diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index 744be37..1ae0fd6 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -6,8 +6,4 @@ @SpringBootTest class DemoApplicationTests { - @Test - void contextLoads() { - } - } From 4d6649886db411a3ea5e9d206147071bcadd4cde Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 17:52:26 +0900 Subject: [PATCH 04/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20ci=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index b4056ad..4273c9e 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -7,7 +7,7 @@ on: jobs: ci: - uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-ci-standard.yml@eb9496c + uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-ci-standard.yml@master with: java-version: "17" distribution: "temurin" From 8565ea24820471546f25bcc3e41cb34cca8302f1 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 17:53:46 +0900 Subject: [PATCH 05/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20ci=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index 4273c9e..457c427 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -7,7 +7,7 @@ on: jobs: ci: - uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-ci-standard.yml@master + uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-gradle-ci.yml@master with: java-version: "17" distribution: "temurin" From a3e4eb09fb6fb87caba87cdc774e5b0844b52970 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 18:02:55 +0900 Subject: [PATCH 06/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20ci=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index 1ae0fd6..ee0eda3 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -1,6 +1,5 @@ package kahlua.KahluaProject; -import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest From 32768049c3613f4775b69694143c455845f30bca Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 22:11:36 +0900 Subject: [PATCH 07/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20cd=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cd.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/spring-cd.yml diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml new file mode 100644 index 0000000..c3bf439 --- /dev/null +++ b/.github/workflows/spring-cd.yml @@ -0,0 +1,21 @@ +name: Spring Boot & Gradle CD + +on: + workflow_run: + workflows: ["Spring Boot & Gradle CI"] + types: [completed] + +jobs: + ci: + uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-gradle-cd.yml@master + with: + java-version: "17" + distribution: "temurin" + image-name: kahlua-web + secrets: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_REPO: ${{ secrets.DOCKER_REPO }} + HOST_ID: ${{ secrets.HOST_ID }} + USERNAME: ${{ secrets.USERNAME }} + PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }} From 1a73619f4847a98308d4670663eeab5db214e5e3 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 22:13:29 +0900 Subject: [PATCH 08/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20cd=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index 457c427..b91744e 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -14,5 +14,6 @@ jobs: build-command: "false" test-command: "false" upload-artifacts: true + write-application-yml: true secrets: APPLICATION: ${{ secrets.APPLICATION }} \ No newline at end of file From c95f84291f77cb01cc41d5ec88e11086576545ac Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 22:20:11 +0900 Subject: [PATCH 09/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20cd=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml index c3bf439..7ddc5d7 100644 --- a/.github/workflows/spring-cd.yml +++ b/.github/workflows/spring-cd.yml @@ -18,4 +18,4 @@ jobs: DOCKER_REPO: ${{ secrets.DOCKER_REPO }} HOST_ID: ${{ secrets.HOST_ID }} USERNAME: ${{ secrets.USERNAME }} - PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }} + PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }} \ No newline at end of file From 889f5852982cf35013a9eec4c1a61be17c13c8b6 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 23:10:07 +0900 Subject: [PATCH 10/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20cd=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index b91744e..139387f 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -16,4 +16,4 @@ jobs: upload-artifacts: true write-application-yml: true secrets: - APPLICATION: ${{ secrets.APPLICATION }} \ No newline at end of file + APPLICATION: ${{ secrets.APPLICATION }} From f6f13f8d0c78dbd41cd86a3593aa1bc0dcc6d270 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 23:10:53 +0900 Subject: [PATCH 11/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20cd=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index ee0eda3..d6d7d45 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -4,5 +4,4 @@ @SpringBootTest class DemoApplicationTests { - } From e6696364c208e0a35df8643b402f0c44a28650fd Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 23:24:20 +0900 Subject: [PATCH 12/28] =?UTF-8?q?test:=20=EA=B3=B5=ED=86=B5=20cd=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20test=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index d6d7d45..ee0eda3 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -4,4 +4,5 @@ @SpringBootTest class DemoApplicationTests { + } From 250c3a771c14a45cb98aae380f2023f01107cbd6 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 23:39:37 +0900 Subject: [PATCH 13/28] =?UTF-8?q?fix:=20=EA=B8=B0=EC=A1=B4=20ci/cd=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cicd.yml | 63 ------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 .github/workflows/spring-cicd.yml diff --git a/.github/workflows/spring-cicd.yml b/.github/workflows/spring-cicd.yml deleted file mode 100644 index 37c4309..0000000 --- a/.github/workflows/spring-cicd.yml +++ /dev/null @@ -1,63 +0,0 @@ -# This workflow will build a Java project with Gradle -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle - -# Repo Action 페이지에 나타날 이름 -name: Spring Boot & Gradle CI/CD - -# Event Trigger -# master branch에 대한 pull request가 close 될 때 동작 -# branch 단위 외에도, tag나 cron 식 등을 사용할 수 있음 -on: - pull_request_target: - branches: [ main ] - types: - - closed - -jobs: - build: - # pull request가 merge된 경우 - if: github.event.pull_request.merged == true - # 실행 환경 지정 - runs-on: ubuntu-24.04 - - # Task의 sequence를 명시한다. - steps: - - uses: actions/checkout@v2 - - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - ## create application.yaml - - name: make application.yml - run: | - cd ./src/main/resources - touch ./application.yml - echo "${{ secrets.APPLICATION }}" > ./application.yml - shell: bash - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - # Build - - name: Build with Gradle - run: ./gradlew clean build -x test - - ## 웹 이미지 빌드 및 도커허브에 push - - name: web docker build and push - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t ${{ secrets.DOCKER_REPO }}/kahlua-web . - docker push ${{ secrets.DOCKER_REPO }}/kahlua-web - ## docker compose up - - name: executing remote ssh commands using password - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.HOST_ID }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.PRIVATE_KEY }} - script: | - sudo docker-compose down - sudo docker pull ${{ secrets.DOCKER_REPO }}/kahlua-web - sudo docker-compose up -d - sudo docker image prune -f From 5945c37bf3f4c7bea7c5f8831239965063f7657c Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sat, 3 Jan 2026 23:52:09 +0900 Subject: [PATCH 14/28] =?UTF-8?q?fix:=20docker=20base=20image=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e57fcfe..c80a489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-jdk +FROM eclipse-temurin:17-jdk WORKDIR /app COPY build/libs/demo-0.0.1-SNAPSHOT.jar app.jar EXPOSE 8080 From 9912a3ad3d63cb4feb428e63ba24aa312372d234 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 00:02:06 +0900 Subject: [PATCH 15/28] =?UTF-8?q?test:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index ee0eda3..d6d7d45 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -4,5 +4,4 @@ @SpringBootTest class DemoApplicationTests { - } From cda17906c614038dc26ae9b1ee4114482982af66 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 00:04:36 +0900 Subject: [PATCH 16/28] =?UTF-8?q?test:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index d6d7d45..ee0eda3 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -4,4 +4,5 @@ @SpringBootTest class DemoApplicationTests { + } From 0b91609c68b339dcc8155a6fbb13c25cc533b9b0 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 00:39:51 +0900 Subject: [PATCH 17/28] =?UTF-8?q?fix:=20cd=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cd.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml index 7ddc5d7..33615e8 100644 --- a/.github/workflows/spring-cd.yml +++ b/.github/workflows/spring-cd.yml @@ -6,7 +6,11 @@ on: types: [completed] jobs: - ci: + cd: + if: > + github.event.workflow_run.conclusion == 'success' && + github.event.workflow_run.head_branch == 'main' && + github.event.workflow_run.event == 'push' uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-gradle-cd.yml@master with: java-version: "17" From 0db79427d1e4605795e3ce31712d2e7947ef3539 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 00:40:28 +0900 Subject: [PATCH 18/28] =?UTF-8?q?test:=20ci/cd=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kahlua/KahluaProject/domain/ticket/TicketUtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/kahlua/KahluaProject/domain/ticket/TicketUtilTest.java b/src/test/java/kahlua/KahluaProject/domain/ticket/TicketUtilTest.java index 40e6f57..355c5e8 100644 --- a/src/test/java/kahlua/KahluaProject/domain/ticket/TicketUtilTest.java +++ b/src/test/java/kahlua/KahluaProject/domain/ticket/TicketUtilTest.java @@ -46,4 +46,4 @@ public static Ticket createMockFreshmanTicket() { return freshmanTicket; } -} +} \ No newline at end of file From 03bb424dae4b268fe61c9f8b6fe889f0c0f59391 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 08:59:07 +0900 Subject: [PATCH 19/28] =?UTF-8?q?test:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cd.yml | 12 +++++------- .github/workflows/spring-ci.yml | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml index 33615e8..5dbaf2c 100644 --- a/.github/workflows/spring-cd.yml +++ b/.github/workflows/spring-cd.yml @@ -1,16 +1,14 @@ name: Spring Boot & Gradle CD on: - workflow_run: - workflows: ["Spring Boot & Gradle CI"] - types: [completed] + push: + branches: [ "main" ] +# workflow_run: +# workflows: ["Spring Boot & Gradle CI"] +# types: [completed] jobs: cd: - if: > - github.event.workflow_run.conclusion == 'success' && - github.event.workflow_run.head_branch == 'main' && - github.event.workflow_run.event == 'push' uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-gradle-cd.yml@master with: java-version: "17" diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index 139387f..c9f84e6 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -2,7 +2,6 @@ name: Spring Boot & Gradle CI on: pull_request: - push: branches: [ "main" ] jobs: From b2cdf68d6089db449ca43a95d220cf0e7f2f5e94 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 09:09:50 +0900 Subject: [PATCH 20/28] =?UTF-8?q?test:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index ee0eda3..163df63 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -5,4 +5,5 @@ @SpringBootTest class DemoApplicationTests { + } From 81745accd99cf6f092259b8bc46e106452bf0a5e Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 23:38:15 +0900 Subject: [PATCH 21/28] =?UTF-8?q?test:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cd.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml index 5dbaf2c..ae60357 100644 --- a/.github/workflows/spring-cd.yml +++ b/.github/workflows/spring-cd.yml @@ -3,9 +3,6 @@ name: Spring Boot & Gradle CD on: push: branches: [ "main" ] -# workflow_run: -# workflows: ["Spring Boot & Gradle CI"] -# types: [completed] jobs: cd: From 77370615583df4b5143251301d6f2bbbfd530409 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Sun, 4 Jan 2026 23:50:45 +0900 Subject: [PATCH 22/28] =?UTF-8?q?test:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-cd.yml | 1 + .github/workflows/spring-ci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/spring-cd.yml b/.github/workflows/spring-cd.yml index ae60357..039729d 100644 --- a/.github/workflows/spring-cd.yml +++ b/.github/workflows/spring-cd.yml @@ -7,6 +7,7 @@ on: jobs: cd: uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-gradle-cd.yml@master + # 참고: https://github.com/kjiyun/CI-CD-pipeline-standard with: java-version: "17" distribution: "temurin" diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index c9f84e6..6fb3f6d 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -7,6 +7,7 @@ on: jobs: ci: uses: kjiyun/CI-CD-pipeline-standard/.github/workflows/java-gradle-ci.yml@master + # 참고: https://github.com/kjiyun/CI-CD-pipeline-standard with: java-version: "17" distribution: "temurin" From cacd051dc8fa42a2160bcde47b55931db938926d Mon Sep 17 00:00:00 2001 From: Jiyun Date: Tue, 6 Jan 2026 23:13:05 +0900 Subject: [PATCH 23/28] =?UTF-8?q?fix:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index 6fb3f6d..3842559 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -17,3 +17,4 @@ jobs: write-application-yml: true secrets: APPLICATION: ${{ secrets.APPLICATION }} + From 4dd040fcfcb8ac5019571e228fc197bfee416e6c Mon Sep 17 00:00:00 2001 From: Jiyun Date: Tue, 6 Jan 2026 23:22:59 +0900 Subject: [PATCH 24/28] =?UTF-8?q?fix:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/spring-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/spring-ci.yml b/.github/workflows/spring-ci.yml index 3842559..6fb3f6d 100644 --- a/.github/workflows/spring-ci.yml +++ b/.github/workflows/spring-ci.yml @@ -17,4 +17,3 @@ jobs: write-application-yml: true secrets: APPLICATION: ${{ secrets.APPLICATION }} - From f95a582c28c051b2dd59685d4e9cd9605da405e2 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Tue, 6 Jan 2026 23:25:12 +0900 Subject: [PATCH 25/28] =?UTF-8?q?fix:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index 163df63..007b97f 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -6,4 +6,5 @@ class DemoApplicationTests { + } From 39b2f30775a0d196a733d7d13ef2265d83873ae2 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Tue, 6 Jan 2026 23:30:25 +0900 Subject: [PATCH 26/28] =?UTF-8?q?fix:=20ci/cd=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/kahlua/KahluaProject/DemoApplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java index 007b97f..696b86e 100644 --- a/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java +++ b/src/test/java/kahlua/KahluaProject/DemoApplicationTests.java @@ -7,4 +7,5 @@ class DemoApplicationTests { + } From 977e4f9599bc5158b574d7fe00936caa29a2ad3a Mon Sep 17 00:00:00 2001 From: Jiyun Date: Tue, 6 Jan 2026 23:36:46 +0900 Subject: [PATCH 27/28] =?UTF-8?q?fix:=20maven=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=9A=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.gradle | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/settings.gradle b/settings.gradle index 0a383dd..52f1287 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,15 @@ rootProject.name = 'demo' + +pluginManagement { + repositories { + gradlePluginPortal() + maven { url = uri("https://repo1.maven.org/maven2") } + } +} + +dependencyResolutionManagement { + repositories { + maven { url = uri("https://repo1.maven.org/maven2") } + maven { url = uri("https://jitpack.io") } + } +} \ No newline at end of file From 038f985a08d23995c666ee7a17e724f46c92d2b3 Mon Sep 17 00:00:00 2001 From: Jiyun Date: Tue, 6 Jan 2026 23:40:01 +0900 Subject: [PATCH 28/28] =?UTF-8?q?fix:=20settings.gradle=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 --- settings.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.gradle b/settings.gradle index 52f1287..4bb8839 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,3 @@ -rootProject.name = 'demo' - pluginManagement { repositories { gradlePluginPortal() @@ -12,4 +10,6 @@ dependencyResolutionManagement { maven { url = uri("https://repo1.maven.org/maven2") } maven { url = uri("https://jitpack.io") } } -} \ No newline at end of file +} + +rootProject.name = 'demo' \ No newline at end of file