From 552b1c9c72facd8cd14c0d4d28d8b970f94b9416 Mon Sep 17 00:00:00 2001 From: jun6292 Date: Sun, 13 Oct 2024 06:40:15 +0000 Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=20=EC=A0=A0=ED=82=A8=EC=8A=A4=20?= =?UTF-8?q?=EC=BD=9C=EB=A0=89=ED=84=B0=20=ED=94=8C=EB=9F=AC=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20CI=20=EC=88=98=EC=A0=95=20-=20pull=20request=20merg?= =?UTF-8?q?e=20=EC=8B=9C=EC=97=90=EB=A7=8C=20=ED=8A=B8=EB=A6=AC=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/plugin-jenkins-inven-collector-ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/plugin-jenkins-inven-collector-ci.yaml b/.github/workflows/plugin-jenkins-inven-collector-ci.yaml index 64d6bb3..3fea4b2 100644 --- a/.github/workflows/plugin-jenkins-inven-collector-ci.yaml +++ b/.github/workflows/plugin-jenkins-inven-collector-ci.yaml @@ -1,13 +1,15 @@ -name: Docker Image CI +name: plugin-jenkins-inven-collector docker image CI on: push: branches: [ main ] pull_request: branches: [ main ] + types: [ closed ] jobs: build: + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: From c31d7f2bb0dfa73612841508161dc3e3bf5cd177 Mon Sep 17 00:00:00 2001 From: jun6292 Date: Sun, 13 Oct 2024 06:59:17 +0000 Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20workflow=20push=20&=20pull=5Freques?= =?UTF-8?q?t.merge=20=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/plugin-jenkins-inven-collector-ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/plugin-jenkins-inven-collector-ci.yaml b/.github/workflows/plugin-jenkins-inven-collector-ci.yaml index 3fea4b2..0fd90c9 100644 --- a/.github/workflows/plugin-jenkins-inven-collector-ci.yaml +++ b/.github/workflows/plugin-jenkins-inven-collector-ci.yaml @@ -1,8 +1,6 @@ name: plugin-jenkins-inven-collector docker image CI on: - push: - branches: [ main ] pull_request: branches: [ main ] types: [ closed ]