From 8b86adf847e2c7404bc043fb9d5d0237657dce52 Mon Sep 17 00:00:00 2001 From: Jon McClure Date: Tue, 19 Sep 2023 08:37:22 +0100 Subject: [PATCH] skip cannary on main branch push --- .github/workflows/canary.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/canary.yaml b/.github/workflows/canary.yaml index 2177912c..7bf7a3d9 100644 --- a/.github/workflows/canary.yaml +++ b/.github/workflows/canary.yaml @@ -9,12 +9,14 @@ jobs: runs-on: ubuntu-latest # Restricts to: # 1) the base repository - # 2) NOT the default branch ("main") - # 3) NOT "ci skip" in commit message - # 4) NOT "skip ci" in commit message + # 2) NOT the default branch ("main") on PR + # 3) NOT the default branch ("main") on push + # 4) NOT "ci skip" in commit message + # 5) NOT "skip ci" in commit message if: | github.repository == 'reuters-graphics/graphics-components' && endsWith(github.event.base_ref, github.event.repository.default_branch) != true && + endsWith(github.event.ref, github.event.repository.default_branch) != true && contains(github.event.head_commit.message, 'ci skip') != true && contains(github.event.head_commit.message, 'skip ci') != true steps: