From dae5571ef43b78404394be4c7b89849a19616192 Mon Sep 17 00:00:00 2001 From: mashin2002 Date: Mon, 2 Sep 2024 00:34:24 +0900 Subject: [PATCH 1/2] cicd: connect workflow --- .github/workflows/dev-cd.yml | 4 ++-- .github/workflows/dev-ci.yml | 2 +- .github/workflows/prod-cd.yml | 4 ++-- .github/workflows/prod-ci.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index 999b142..becfcf4 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -3,9 +3,9 @@ name: CD for Dev on: workflow_run: - workflows: ["CI for Dev"] + workflows: ["CI-Dev"] types: - - completed + - success permissions: contents: read diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index 9944678..7896ea1 100644 --- a/.github/workflows/dev-ci.yml +++ b/.github/workflows/dev-ci.yml @@ -1,5 +1,5 @@ # .github/workflows/dev-ci.yml -name: CI for Dev +name: CI-Dev on: push: diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 7c11698..43b157f 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -3,9 +3,9 @@ name: CD for Prod on: workflow_run: - workflows: ["CI for Prod"] + workflows: ["CI-Prod"] types: - - completed + - success permissions: contents: read diff --git a/.github/workflows/prod-ci.yml b/.github/workflows/prod-ci.yml index 6a62bdc..6641313 100644 --- a/.github/workflows/prod-ci.yml +++ b/.github/workflows/prod-ci.yml @@ -1,5 +1,5 @@ # .github/workflows/dev-ci.yml -name: CI for Prod +name: CI-Prod on: push: From 9b0655e055a58d1628c76b2e688ab0c5864ddde9 Mon Sep 17 00:00:00 2001 From: mashin2002 Date: Mon, 2 Sep 2024 00:42:00 +0900 Subject: [PATCH 2/2] cicd: connect workflow --- .github/workflows/dev-cd.yml | 6 ++---- .github/workflows/dev-ci.yml | 4 +--- .github/workflows/prod-cd.yml | 6 ++---- .github/workflows/prod-ci.yml | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index becfcf4..381ac7f 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -2,10 +2,8 @@ name: CD for Dev on: - workflow_run: - workflows: ["CI-Dev"] - types: - - success + push: + branches: [ "dev" ] permissions: contents: read diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index 7896ea1..e2f1511 100644 --- a/.github/workflows/dev-ci.yml +++ b/.github/workflows/dev-ci.yml @@ -2,11 +2,9 @@ name: CI-Dev on: - push: + pull_request: branches: [ "dev" ] -permissions: - contents: read jobs: build: diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 43b157f..4711e16 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -2,10 +2,8 @@ name: CD for Prod on: - workflow_run: - workflows: ["CI-Prod"] - types: - - success + push: + branches: [ "prod" ] permissions: contents: read diff --git a/.github/workflows/prod-ci.yml b/.github/workflows/prod-ci.yml index 6641313..529d896 100644 --- a/.github/workflows/prod-ci.yml +++ b/.github/workflows/prod-ci.yml @@ -2,7 +2,7 @@ name: CI-Prod on: - push: + pull_request: branches: [ "prod" ] permissions: