From 50e38dc7d7991f1f00763927efc898f4c5bdb108 Mon Sep 17 00:00:00 2001 From: James Maes Date: Wed, 21 Oct 2026 10:17:40 -0500 Subject: [PATCH 1/2] ci: use shared orb pipelines and source scanning Co-Authored-By: Codex --- .circleci/config.yml | 63 ++++++------------------------------ .github/workflows/codeql.yml | 23 +++++++++++++ .qqq-ci.yml | 16 +++++++++ 3 files changed, 49 insertions(+), 53 deletions(-) create mode 100644 .github/workflows/codeql.yml create mode 100644 .qqq-ci.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index f632b2c..e274f67 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,57 +1,14 @@ version: 2.1 - +setup: true orbs: - qqq-orb: kingsrook/qqq-orb@0.5.0 - + qqq-orb: kingsrook/qqq-orb@0.7.13 workflows: - - test_only: + setup: jobs: - - qqq-orb/mvn_test_only: - context: [ qqq-maven-registry-credentials ] - filters: - branches: - ignore: /(develop|main|release/.*|hotfix/.*|integration.*)/ - tags: - only: [] - - publish_snapshot: - jobs: - - qqq-orb/mvn_publish: - context: [ qqq-maven-registry-credentials ] - branch_type: snapshot - filters: - branches: - only: - - develop - - publish_release_candidate: - jobs: - - qqq-orb/mvn_publish: - context: [ qqq-maven-registry-credentials ] - branch_type: release_candidate - filters: - branches: - only: - - /release\/.*/ - - publish_release: - jobs: - - qqq-orb/mvn_publish: - context: [ qqq-maven-registry-credentials ] - branch_type: release - filters: - branches: - only: [ main ] - tags: - only: [ /v.*/ ] - - publish_hotfix_release: - jobs: - - qqq-orb/mvn_publish: - context: [ qqq-maven-registry-credentials ] - branch_type: hotfix - filters: - branches: - only: - - /hotfix\/.*/ + - qqq-orb/generate_pipeline: + orb_version: 0.7.13 + filters: + branches: + ignore: automation/qbit-rc-pending + tags: + only: /v.*/ diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..bd3ceaf --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,23 @@ +name: CodeQL +'on': + push: + branches: + - main + - develop + - release/** + - hotfix/** + pull_request: {} + schedule: + - cron: 41 16 * * 0 + workflow_dispatch: {} +permissions: + contents: read + actions: read + security-events: write + packages: read +concurrency: + group: codeql-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} +jobs: + analyze: + uses: QRun-IO/qqq-orb/.github/workflows/qbit-codeql.yml@c288a8864fe9054f68410e1d78f5863aea4c4d22 diff --git a/.qqq-ci.yml b/.qqq-ci.yml new file mode 100644 index 0000000..9e98664 --- /dev/null +++ b/.qqq-ci.yml @@ -0,0 +1,16 @@ +profile: qbit +orb_version: 0.7.13 +default_branch: develop +java_version: '21' +browsers: true +api_checks: false +docs_only: false +release_on_main: true +release_tag_policy: v-prefix +test_branch_policy: feature-no-hotfix +publish: + snapshot: true + release_candidate: true + release: true + hotfix: true + asciidoc: false -- 2.54.0 From 4db03a53350cf810fa8736c0fa6012e1275b8112 Mon Sep 17 00:00:00 2001 From: James Maes Date: Wed, 21 Oct 2026 11:08:18 -0500 Subject: [PATCH 2/2] fix: use released QQQ BOM on main Replace unavailable 0.40.0-SNAPSHOT with the matching 0.40.0 release. Validated with Maven 3.9.11 clean verify: 18 tests passed. Co-Authored-By: Codex --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00539a5..3d91316 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ com.kingsrook.qqq qqq-bom-pom - 0.40.0-SNAPSHOT + 0.40.0 pom import -- 2.54.0