From 49404ef0532a3999dcd60eb4fc00260ebeaa93ad Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sat, 5 Nov 2022 04:57:19 +0100 Subject: [PATCH] GH Actions: clean up after branch rename Make sure branch names in the branch selection are correct to ensure builds will still run when appropriate. --- .github/workflows/cs.yml | 4 ++-- .github/workflows/js.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cs.yml b/.github/workflows/cs.yml index 8d1214c..63c6a34 100644 --- a/.github/workflows/cs.yml +++ b/.github/workflows/cs.yml @@ -1,10 +1,10 @@ name: CS on: - # Run on all pushes (except to master) and on all pull requests. + # Run on all pushes (except to main) and on all pull requests. push: branches-ignore: - - 'master' + - 'main' pull_request: # Allow manually triggering the workflow. workflow_dispatch: diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 2da2dac..7f2844c 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -4,7 +4,7 @@ on: # Run on pushes to select branches and on all pull requests. push: branches: - - master + - main - trunk - 'release/**' - 'hotfix/[0-9]+.[0-9]+*' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4d81847..6b2fe01 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ on: # Run on pushes to select branches and on all pull requests. push: branches: - - master + - main - trunk - 'release/**' - 'hotfix/[0-9]+.[0-9]+*' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34b3bc2..1f83fb7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: # Run on pushes to select branches and on all pull requests. push: branches: - - master + - main - trunk - 'release/**' - 'hotfix/[0-9]+.[0-9]+*'