From cc652a38d9516c0f5c1230d4ce5461f3d0f7accf Mon Sep 17 00:00:00 2001 From: "tejaswini.bandlamudi" Date: Tue, 11 Apr 2023 10:56:15 +0530 Subject: [PATCH 1/2] fix matching pattern on release branches --- .github/workflows/cron-job-its.yml | 2 +- .github/workflows/static-checks.yml | 4 ++-- .github/workflows/unit-and-integration-tests-unified.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cron-job-its.yml b/.github/workflows/cron-job-its.yml index 199935970872..38f11499afc2 100644 --- a/.github/workflows/cron-job-its.yml +++ b/.github/workflows/cron-job-its.yml @@ -22,7 +22,7 @@ on: - 'owasp-dependency-check-suppressions.xml' branches: - master - - /^\d+\.\d+\.\d+(-\S*)?$/ # release branches + - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches jobs: build: diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index cc5ded8debf4..551fb16ad9f8 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -18,11 +18,11 @@ on: push: branches: - master - - /^\d+\.\d+\.\d+(-\S*)?$/ # release branches + - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches pull_request: branches: - master - - /^\d+\.\d+\.\d+(-\S*)?$/ # release branches + - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml index b899ab0740af..bfc4e9e4c631 100644 --- a/.github/workflows/unit-and-integration-tests-unified.yml +++ b/.github/workflows/unit-and-integration-tests-unified.yml @@ -24,7 +24,7 @@ on: - '**/*.md' branches: - master - - /^\d+\.\d+\.\d+(-\S*)?$/ # release branches + - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches pull_request: paths-ignore: - 'docs/**' @@ -34,7 +34,7 @@ on: - '**/*.md' branches: - master - - /^\d+\.\d+\.\d+(-\S*)?$/ # release branches + - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' From 2d523fea28afc5d29240f604b4b199b0b2912ae5 Mon Sep 17 00:00:00 2001 From: "tejaswini.bandlamudi" Date: Wed, 12 Apr 2023 01:58:30 +0530 Subject: [PATCH 2/2] test --- .github/workflows/cron-job-its.yml | 3 ++- .github/workflows/static-checks.yml | 6 ++++-- .github/workflows/unit-and-integration-tests-unified.yml | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cron-job-its.yml b/.github/workflows/cron-job-its.yml index 38f11499afc2..02f42292163e 100644 --- a/.github/workflows/cron-job-its.yml +++ b/.github/workflows/cron-job-its.yml @@ -22,7 +22,8 @@ on: - 'owasp-dependency-check-suppressions.xml' branches: - master - - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches + - '[0-9]+.[0-9]+.[0-9]+' # release branches + - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches jobs: build: diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index 551fb16ad9f8..08f810764677 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -18,11 +18,13 @@ on: push: branches: - master - - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches + - '[0-9]+.[0-9]+.[0-9]+' # release branches + - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches pull_request: branches: - master - - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches + - '[0-9]+.[0-9]+.[0-9]+' # release branches + - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml index bfc4e9e4c631..20025c336542 100644 --- a/.github/workflows/unit-and-integration-tests-unified.yml +++ b/.github/workflows/unit-and-integration-tests-unified.yml @@ -24,7 +24,8 @@ on: - '**/*.md' branches: - master - - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches + - '[0-9]+.[0-9]+.[0-9]+' # release branches + - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches pull_request: paths-ignore: - 'docs/**' @@ -34,7 +35,8 @@ on: - '**/*.md' branches: - master - - [0-9]+.[0-9]+.[0-9]+[-[^ ]*]? # release branches + - '[0-9]+.[0-9]+.[0-9]+' # release branches + - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'