From 0301e502eab8907db7b583278a85c7971a2bf774 Mon Sep 17 00:00:00 2001 From: eps1lon Date: Mon, 11 Apr 2022 22:30:38 +0200 Subject: [PATCH 1/2] chore: Ensure support for releases from release branches --- .github/workflows/validate.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 0152c6e5..7f1b7e36 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -2,7 +2,9 @@ name: validate on: push: branches: - - '+([0-9])?(.{+([0-9]),x}).x' + # Match SemVer major release branches + # e.g. "12.x" or "8.x" + - '[0-9]+.x' - 'main' - 'next' - 'next-major' @@ -57,9 +59,7 @@ jobs: needs: main runs-on: ubuntu-latest if: - ${{ github.repository == 'testing-library/dom-testing-library' && - contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha', - github.ref) && github.event_name == 'push' }} + ${{ github.repository == 'testing-library/dom-testing-library' && github.event_name == 'push' }} steps: - name: 🛑 Cancel Previous Runs uses: styfle/cancel-workflow-action@0.9.0 From 4aa76b10f6dfa611003fb972a0e6b9f27e358bd7 Mon Sep 17 00:00:00 2001 From: eps1lon Date: Mon, 11 Apr 2022 22:33:25 +0200 Subject: [PATCH 2/2] format --- .github/workflows/validate.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 7f1b7e36..a0053f55 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -59,7 +59,8 @@ jobs: needs: main runs-on: ubuntu-latest if: - ${{ github.repository == 'testing-library/dom-testing-library' && github.event_name == 'push' }} + ${{ github.repository == 'testing-library/dom-testing-library' && + github.event_name == 'push' }} steps: - name: 🛑 Cancel Previous Runs uses: styfle/cancel-workflow-action@0.9.0