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: 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 { + }