From 992ad833d1a0ec2a05d1e3a5461fdd66a9306b26 Mon Sep 17 00:00:00 2001 From: Doug Lauder Date: Fri, 1 Oct 2021 10:24:21 -0400 Subject: [PATCH] run all CI on PRs to be merged with release branches (#1390) --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dev-release.yml | 2 +- .github/workflows/lint-plugin.yml | 2 +- .github/workflows/lint-server.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50be7f078..7048a95e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: [ main, release-** ] pull_request: - branches: [ main ] + branches: [ main, release-** ] jobs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c1aa6598e..6343b3c87 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ on: branches: [ main, release-** ] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [ main, release-** ] schedule: - cron: '30 4 * * 0' diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index 3a560ebc3..e12a7396b 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -4,7 +4,7 @@ on: push: branches: [ main, release-** ] pull_request: - branches: [ main ] + branches: [ main, release-** ] workflow_dispatch: jobs: diff --git a/.github/workflows/lint-plugin.yml b/.github/workflows/lint-plugin.yml index 610d78eb9..30ba7c7bf 100644 --- a/.github/workflows/lint-plugin.yml +++ b/.github/workflows/lint-plugin.yml @@ -4,7 +4,7 @@ on: push: branches: [ main, release-** ] pull_request: - branches: [ main ] + branches: [ main, release-** ] jobs: golangci: diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml index 15e3d9755..ef67e6c81 100644 --- a/.github/workflows/lint-server.yml +++ b/.github/workflows/lint-server.yml @@ -4,7 +4,7 @@ on: push: branches: [ main, release-** ] pull_request: - branches: [ main ] + branches: [ main, release-** ] jobs: golangci: