Skip to content

Commit

Permalink
chore: Also trigger workflow when merging into v2 (#1343)
Browse files Browse the repository at this point in the history
Currently we can't reliably merge into v2 because checks don't
automatically trigger
  • Loading branch information
another-rex authored Oct 25, 2024
1 parent 0c43a0e commit 5e0e196
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/osv-scanner-unified-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5e0e196

Please sign in to comment.