From 73ecb81041fe3bd69ef0c2ef96f6bcad5074a16f Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 21:34:24 +0900 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=EB=B3=80=EC=88=98=20=EB=88=84?= =?UTF-8?q?=EB=9D=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 ++ demo/build.gradle | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 68e4dc0..fecae17 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,6 +32,8 @@ jobs: - name: Get Modified Files run: | + echo "event_before : ${{ github.event.before }}" + echo "after : ${{ github.sha }}" MODIFIED_FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | tr '\n' ' ') echo $MODIFIED_FILES echo "MODIFIED_FILES=$MODIFIED_FILES" >> $GITHUB_ENV diff --git a/demo/build.gradle b/demo/build.gradle index 3b5233d..58de6b3 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -30,7 +30,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.cloud:spring-cloud-starter' - implementation 'org.springframework.cloud:spring-cloud-starter-config' implementation 'org.springframework.boot:spring-boot-starter-actuator' // KMS From 0fef95d552173589b531e26bb3d322c3fccaea8f Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 21:49:06 +0900 Subject: [PATCH 2/8] chore: CHECK --- .github/workflows/gradle.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index fecae17..d548c7e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,6 +12,17 @@ concurrency: cancel-in-progress: true jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Git Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: check variables + run: | + echo "${{ toJson(github.event) }}" + echo "${{ toJson(github) }}" fetch-and-diff: runs-on: ubuntu-latest env: @@ -34,7 +45,7 @@ jobs: run: | echo "event_before : ${{ github.event.before }}" echo "after : ${{ github.sha }}" - MODIFIED_FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | tr '\n' ' ') + MODIFIED_FILES=$(git diff --name-only ${{ github.event.after }} ${{ github.sha }} | tr '\n' ' ') echo $MODIFIED_FILES echo "MODIFIED_FILES=$MODIFIED_FILES" >> $GITHUB_ENV From fe8610f58691bb540c519f79d4347148630b1175 Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 21:51:41 +0900 Subject: [PATCH 3/8] chore: CHECK --- .github/workflows/gradle.yml | 15 +++------------ .../com/example/demo/home/HomeController.java | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d548c7e..2520e6d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,17 +12,6 @@ concurrency: cancel-in-progress: true jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Git Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: check variables - run: | - echo "${{ toJson(github.event) }}" - echo "${{ toJson(github) }}" fetch-and-diff: runs-on: ubuntu-latest env: @@ -39,13 +28,15 @@ jobs: - name: Fetch Base Branch run: | + echo "From : ${{ github.head_ref }}" + echo "To : ${{ github.base_ref }}" git fetch origin +refs/heads/${{ github.head_ref }}:refs/remotes/origin/${{ github.base_ref }} - name: Get Modified Files run: | echo "event_before : ${{ github.event.before }}" echo "after : ${{ github.sha }}" - MODIFIED_FILES=$(git diff --name-only ${{ github.event.after }} ${{ github.sha }} | tr '\n' ' ') + MODIFIED_FILES=$(git diff --name-only ${{ github.head_ref }} ${{ github.base_ref }} | tr '\n' ' ') echo $MODIFIED_FILES echo "MODIFIED_FILES=$MODIFIED_FILES" >> $GITHUB_ENV diff --git a/demo/src/main/java/com/example/demo/home/HomeController.java b/demo/src/main/java/com/example/demo/home/HomeController.java index 30b77f4..9513ff8 100644 --- a/demo/src/main/java/com/example/demo/home/HomeController.java +++ b/demo/src/main/java/com/example/demo/home/HomeController.java @@ -11,7 +11,7 @@ public class HomeController { @RequestMapping(value = "/home") public String home() { System.out.println("home Check"); - System.out.println("Trivy 테스트10"); + System.out.println("Trivy 테스트11"); return "Welcome home"; } } From 12b1aeb40192d41c19b48a16e5b20b7430b572ba Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 21:55:03 +0900 Subject: [PATCH 4/8] chore: CHECK --- .github/workflows/gradle.yml | 4 +--- .../src/main/java/com/example/demo/home1/Home1Controller.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2520e6d..8a5990f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,9 +34,7 @@ jobs: - name: Get Modified Files run: | - echo "event_before : ${{ github.event.before }}" - echo "after : ${{ github.sha }}" - MODIFIED_FILES=$(git diff --name-only ${{ github.head_ref }} ${{ github.base_ref }} | tr '\n' ' ') + MODIFIED_FILES=$(git diff --name-only origin/${{ github.head_ref }} ${{ github.base_ref }} | tr '\n' ' ') echo $MODIFIED_FILES echo "MODIFIED_FILES=$MODIFIED_FILES" >> $GITHUB_ENV diff --git a/demo1/src/main/java/com/example/demo/home1/Home1Controller.java b/demo1/src/main/java/com/example/demo/home1/Home1Controller.java index 56f493d..3175489 100644 --- a/demo1/src/main/java/com/example/demo/home1/Home1Controller.java +++ b/demo1/src/main/java/com/example/demo/home1/Home1Controller.java @@ -9,7 +9,7 @@ public class Home1Controller { @GetMapping public String home1(){ - System.out.println("home1_11"); + System.out.println("home1_12"); return "home1"; } } From fcb2c79eb02cae8bb7c9d5e34e07e1e766bcced8 Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 21:56:00 +0900 Subject: [PATCH 5/8] chore: CHECK(3) --- .github/workflows/gradle.yml | 2 +- demo/src/main/java/com/example/demo/home/HomeController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8a5990f..1aebc9d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,7 +34,7 @@ jobs: - name: Get Modified Files run: | - MODIFIED_FILES=$(git diff --name-only origin/${{ github.head_ref }} ${{ github.base_ref }} | tr '\n' ' ') + MODIFIED_FILES=$(git diff --name-only origin/${{ github.head_ref }} origin/${{ github.base_ref }} | tr '\n' ' ') echo $MODIFIED_FILES echo "MODIFIED_FILES=$MODIFIED_FILES" >> $GITHUB_ENV diff --git a/demo/src/main/java/com/example/demo/home/HomeController.java b/demo/src/main/java/com/example/demo/home/HomeController.java index 9513ff8..f4c0d05 100644 --- a/demo/src/main/java/com/example/demo/home/HomeController.java +++ b/demo/src/main/java/com/example/demo/home/HomeController.java @@ -11,7 +11,7 @@ public class HomeController { @RequestMapping(value = "/home") public String home() { System.out.println("home Check"); - System.out.println("Trivy 테스트11"); + System.out.println("Trivy 테스트12"); return "Welcome home"; } } From ec9af55074a28c66f921c8b18a12c434ce8f7868 Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 22:04:09 +0900 Subject: [PATCH 6/8] chore: CHECK(3) --- .github/workflows/gradle.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1aebc9d..652f11c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -26,18 +26,18 @@ jobs: with: fetch-depth: 0 - - name: Fetch Base Branch - run: | - echo "From : ${{ github.head_ref }}" - echo "To : ${{ github.base_ref }}" - git fetch origin +refs/heads/${{ github.head_ref }}:refs/remotes/origin/${{ github.base_ref }} - - name: Get Modified Files run: | MODIFIED_FILES=$(git diff --name-only origin/${{ github.head_ref }} origin/${{ github.base_ref }} | tr '\n' ' ') echo $MODIFIED_FILES echo "MODIFIED_FILES=$MODIFIED_FILES" >> $GITHUB_ENV + - name: Fetch Base Branch + run: | + echo "From : ${{ github.head_ref }}" + echo "To : ${{ github.base_ref }}" + git fetch origin +refs/heads/${{ github.head_ref }}:refs/remotes/origin/${{ github.base_ref }} + - name: Determine Modified Modules id: determine_modules run: | From 399986c8dc12078a5c7593da1bd477ddcb400031 Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 22:08:09 +0900 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=EB=8F=99=EC=8B=9C=EC=84=B1=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EB=8C=80=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 652f11c..e296338 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,7 +8,7 @@ on: - dev concurrency: - group: ci-pr-${{ github.head_ref }} + group: ci-pr-${{ github.base_ref }} cancel-in-progress: true jobs: From 1695c8b99ce4d5371fc5efb5b971b328f8ea4736 Mon Sep 17 00:00:00 2001 From: jerry-world Date: Sun, 19 Oct 2025 22:15:06 +0900 Subject: [PATCH 8/8] =?UTF-8?q?chore:=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/build.gradle | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index 58de6b3..7ac9ee1 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -27,7 +27,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.cloud:spring-cloud-starter' implementation 'org.springframework.boot:spring-boot-starter-actuator' @@ -35,16 +34,6 @@ dependencies { // KMS implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5' - // Jpa - JSON - implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.6' - - // queryDSL - implementation 'com.querydsl:querydsl-jpa:5.1.0:jakarta' - implementation 'com.querydsl:querydsl-sql-spatial:5.1.0' - annotationProcessor "com.querydsl:querydsl-apt:5.1.0:jakarta" - annotationProcessor "jakarta.annotation:jakarta.annotation-api" - annotationProcessor "jakarta.persistence:jakarta.persistence-api" - // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'