From 5e0e19603f2027312246a0893faa8df5a36a2823 Mon Sep 17 00:00:00 2001 From: Rex P <106129829+another-rex@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:15:08 +1100 Subject: [PATCH] chore: Also trigger workflow when merging into v2 (#1343) Currently we can't reliably merge into v2 because checks don't automatically trigger --- .github/workflows/checks.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/osv-scanner-unified-action.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ae6ad29408..6bb4f5fd2f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -16,10 +16,10 @@ name: Checks on: push: - branches: [main] + branches: [main, v2] pull_request: # The branches below must be a subset of the branches above - branches: [main] + branches: [main, v2] concurrency: # Pushing new changes to a branch will cancel any in-progress CI runs diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4dc3aa8ea4..95fb0457d1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [main] + branches: [main, v2] pull_request: # The branches below must be a subset of the branches above - branches: [main] + branches: [main, v2] # Restrict jobs in this workflow to have no permissions by default; permissions # should be granted per job as needed using a dedicated `permissions` block diff --git a/.github/workflows/osv-scanner-unified-action.yml b/.github/workflows/osv-scanner-unified-action.yml index 7ae55267a3..140e6feabb 100644 --- a/.github/workflows/osv-scanner-unified-action.yml +++ b/.github/workflows/osv-scanner-unified-action.yml @@ -16,11 +16,11 @@ name: OSV-Scanner Scheduled Scan on: pull_request: - branches: ["main"] + branches: ["main", "v2"] schedule: - cron: "12 12 * * 1" push: - branches: ["main"] + branches: ["main", "v2"] # Restrict jobs in this workflow to have no permissions by default; permissions # should be granted per job as needed using a dedicated `permissions` block diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 7d4d6fa439..6a589fec35 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -12,7 +12,7 @@ on: schedule: - cron: "32 22 * * 6" push: - branches: ["main"] + branches: ["main", "v2"] # Restrict jobs in this workflow to have no permissions by default; permissions # should be granted per job as needed using a dedicated `permissions` block