From 30cf078df560aa8eeebd1aa4fb9aea6d0dd81de1 Mon Sep 17 00:00:00 2001 From: kharhamel Date: Mon, 26 Apr 2021 15:14:21 +0200 Subject: [PATCH] FIX: the deploy action now only start when the label 'deploy' is applied to the PR --- .github/workflows/build-and-deploy.yml | 14 ++++++++------ .github/workflows/cleanup.yml | 3 ++- .github/workflows/continuous_integration.yml | 7 +++++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index ce186cec..4ed83831 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -1,7 +1,9 @@ name: Build, push and deploy Docker image on: - - push + pull_request: + types: [ labeled, synchronize ] + # Enables BuildKit env: @@ -10,7 +12,7 @@ env: jobs: build-front: - + if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }} runs-on: ubuntu-latest steps: @@ -34,7 +36,7 @@ jobs: add_git_labels: true build-back: - + if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }} runs-on: ubuntu-latest steps: @@ -57,7 +59,7 @@ jobs: add_git_labels: true build-pusher: - + if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }} runs-on: ubuntu-latest steps: @@ -80,7 +82,7 @@ jobs: add_git_labels: true build-uploader: - + if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }} runs-on: ubuntu-latest steps: @@ -103,7 +105,7 @@ jobs: add_git_labels: true build-maps: - + if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }} runs-on: ubuntu-latest steps: diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index bb6bcc89..558a2c3e 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -1,7 +1,8 @@ name: Cleanup images and environments on: - - delete + pull_request: + types: [ closed ] # Enables BuildKit env: diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 607dbf79..38d8c8f0 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -3,8 +3,11 @@ name: "Continuous Integration" on: - - "pull_request" - - "push" + push: + branches: + - master + - develop + pull_request: jobs: