diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 68e4dc0..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: @@ -26,16 +26,18 @@ jobs: with: fetch-depth: 0 - - name: Fetch Base Branch - run: | - 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 ${{ github.event.before }} ${{ github.sha }} | 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 + - 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: | diff --git a/demo/build.gradle b/demo/build.gradle index 3b5233d..7ac9ee1 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -27,25 +27,13 @@ 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.cloud:spring-cloud-starter-config' implementation 'org.springframework.boot:spring-boot-starter-actuator' // 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' 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..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 테스트10"); + System.out.println("Trivy 테스트12"); return "Welcome home"; } } 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"; } }