From 6648e6ec1bcef689e134578e7806047b07deab89 Mon Sep 17 00:00:00 2001 From: "David M. Johnson" Date: Sat, 3 Oct 2026 21:15:18 -0400 Subject: [PATCH] Run CI and CodeQL on roller-6.1.x The maintenance branch is maintained alongside master, so pushes and pull requests that target it need the same build, tests and code scanning. --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d06a70d93..e651f7bef 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -8,10 +8,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ master, roller-6.1.x ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ master, roller-6.1.x ] schedule: - cron: '39 16 * * 1' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16ac36cf3..f89391b61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,9 @@ name: Apache Roller on: push: - branches: [master] + branches: [master, roller-6.1.x] pull_request: - branches: [master] + branches: [master, roller-6.1.x] jobs: build-test: