From c1429231f62a98f1bda5a5ad1dc1cf8a818624d7 Mon Sep 17 00:00:00 2001 From: kirich1409 Date: Sun, 17 May 2026 20:34:19 +0300 Subject: [PATCH 1/2] Add develop branch to CI pipeline triggers Mirror main triggers onto develop for the new gitflow integration branch: ci, codeql, dependency-review build/scan on push/PR to develop, docs site is built on develop but published to Pages only from main or release tags, and publish.yml emits SNAPSHOTs from both branches while tagged release publication remains main-only. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docs.yml | 6 ++++-- .github/workflows/publish.yml | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f35f532..328bb40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ main ] + branches: [ main, develop ] pull_request: - branches: [ main ] + branches: [ main, develop ] permissions: contents: read diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9ae0ba7..67bbf0c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,9 +2,9 @@ name: CodeQL on: push: - branches: [ main ] + branches: [ main, develop ] pull_request: - branches: [ main ] + branches: [ main, develop ] schedule: - cron: "0 0 * * 0" # Every Sunday at midnight diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 4388ac5..7646f06 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -2,7 +2,7 @@ name: Dependency Review on: pull_request: - branches: [ main ] + branches: [ main, develop ] permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a5624cd..813f5ef 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - develop pull_request: branches: - main + - develop tags: - "v[0-9]+.[0-9]+.[0-9]+" - "v[0-9]+.[0-9]+.[0-9]+-*" @@ -58,8 +60,8 @@ jobs: name: Publish to GitHub Pages runs-on: ubuntu-latest needs: build-docs - # Only publish on pushes to main or on release tags — not on PRs - if: github.event_name == 'push' + # Only publish on pushes to main or on release tags — not on PRs or develop + if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f95a3bc..ee87f8f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,6 +7,7 @@ on: - "v[0-9]+.[0-9]+.[0-9]+-*" branches: - main + - develop permissions: contents: read From b8e139a964598960dc6f305f40a1ef3fea61a2b1 Mon Sep 17 00:00:00 2001 From: kirich1409 Date: Sun, 17 May 2026 21:52:45 +0300 Subject: [PATCH 2/2] Address review: skip CodeQL on workflow-only PRs, fix tag triggers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CodeQL diff-range scanner fails with "no source code seen during build" when a PR touches no Java/Kotlin sources. Add paths-ignore for workflow, docs, and markdown files so docs/CI-config PRs no longer break the scan; weekly schedule still does a full scan. Move docs.yml tag patterns from pull_request to push — pull_request does not support tag filters, so tag-driven docs publication was unreachable despite the publish-docs if: clause checking for refs/tags/. --- .github/workflows/codeql.yml | 8 ++++++++ .github/workflows/docs.yml | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 67bbf0c..f560357 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -3,8 +3,16 @@ name: CodeQL on: push: branches: [ main, develop ] + paths-ignore: + - '.github/workflows/**' + - 'docs/**' + - '**/*.md' pull_request: branches: [ main, develop ] + paths-ignore: + - '.github/workflows/**' + - 'docs/**' + - '**/*.md' schedule: - cron: "0 0 * * 0" # Every Sunday at midnight diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 813f5ef..3c0031e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,13 +5,13 @@ on: branches: - main - develop + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+-*" pull_request: branches: - main - develop - tags: - - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+-*" permissions: contents: write