From b28e02c6fabfee05b3d4245079a74c82c24d50be Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Thu, 2 Feb 2023 17:16:06 +0100 Subject: [PATCH] ACS-3750 Improve branch detection in if conditions (#1722) --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbf1040b09..72c6e85067 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - ((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && github.event_name != 'pull_request') && + ((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request') && !contains(github.event.head_commit.message, '[skip tests]') && !contains(github.event.head_commit.message, '[force]') steps: @@ -133,7 +133,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[db]')) && @@ -163,7 +163,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request') && !contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[latest db]') || contains(github.event.head_commit.message, '[db]')) && @@ -189,7 +189,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request') && !contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[latest db]') || contains(github.event.head_commit.message, '[db]')) && @@ -215,7 +215,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && github.event_name != 'pull_request' && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[db]')) && !contains(github.event.head_commit.message, '[skip tests]') && @@ -337,7 +337,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && !contains(github.event.head_commit.message, '[skip tas]')) || contains(github.event.head_commit.message, '[tas]')) && !contains(github.event.head_commit.message, '[skip tests]') && @@ -427,7 +427,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && !contains(github.event.head_commit.message, '[skip ags]')) || contains(github.event.head_commit.message, '[ags]')) && !contains(github.event.head_commit.message, '[skip tests]') && @@ -458,7 +458,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && !contains(github.event.head_commit.message, '[skip ags]')) || contains(github.event.head_commit.message, '[ags on MySQL]')) && !contains(github.event.head_commit.message, '[skip tests]') && @@ -489,7 +489,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare] if: > - (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && !contains(github.event.head_commit.message, '[skip ags]') && !contains(github.event.head_commit.message, '[skip tas]')) || (contains(github.event.head_commit.message, '[ags]') && contains(github.event.head_commit.message, '[tas]'))) && !contains(github.event.head_commit.message, '[skip tests]') &&