From 5dd9b4b241e79165138c8fb5a04b5e198f185e59 Mon Sep 17 00:00:00 2001 From: James Maes Date: Tue, 20 Oct 2026 19:33:00 -0500 Subject: [PATCH] ci: adopt shared orb with published Custom Apps dependencies Co-Authored-By: Codex --- .circleci/config.yml | 72 ++++++-------------------------------------- .qqq-ci.yml | 16 ++++++++++ pom.xml | 19 ++++++++++-- 3 files changed, 42 insertions(+), 65 deletions(-) create mode 100644 .qqq-ci.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 97bb018..55fd391 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,66 +1,14 @@ version: 2.1 - +setup: true orbs: - qqq-orb: kingsrook/qqq-orb@0.3.12 - -commands: - configure-package-install: - steps: - - run: - name: Keep package installation unattended - command: | - # These build machines are discarded after the job; without this, - # needrestart blocks apt in "Install Java" until the 10m no-output timeout. - sudo install -d /etc/needrestart/conf.d - printf '%s\n' '$nrconf{restart} = "l";' | sudo tee /etc/needrestart/conf.d/99-qqq-ci.conf >/dev/null - - + qqq-orb: kingsrook/qqq-orb@0.7.4 workflows: - test_only: + setup: jobs: - - qqq-orb/mvn_test_only: - pre-steps: - - configure-package-install - context: [qqq-maven-registry-credentials] - filters: - branches: - ignore: /(develop|main|release/.*|integration.*)/ - tags: - only: [] - - publish_snapshot: - jobs: - - qqq-orb/mvn_publish: - pre-steps: - - configure-package-install - context: [qqq-maven-registry-credentials] - branch_type: snapshot - filters: - branches: - only: - - develop - - publish_release_candidate: - jobs: - - qqq-orb/mvn_publish: - pre-steps: - - configure-package-install - context: [qqq-maven-registry-credentials] - branch_type: release_candidate - filters: - branches: - only: - - /release\/.*/ - - publish_release: - jobs: - - qqq-orb/mvn_publish: - pre-steps: - - configure-package-install - context: [qqq-maven-registry-credentials] - branch_type: release - filters: - branches: - ignore: /.*/ - tags: - only: [/v.*/] + - qqq-orb/generate_pipeline: + orb_version: 0.7.4 + filters: + branches: + ignore: automation/qbit-rc-pending + tags: + only: /v.*/ diff --git a/.qqq-ci.yml b/.qqq-ci.yml new file mode 100644 index 0000000..fad5471 --- /dev/null +++ b/.qqq-ci.yml @@ -0,0 +1,16 @@ +profile: qbit +orb_version: 0.7.4 +default_branch: main +java_version: '21' +browsers: true +api_checks: false +docs_only: false +release_on_main: false +release_tag_policy: v-prefix +test_branch_policy: feature +publish: + snapshot: true + release_candidate: true + release: true + asciidoc: false +release_completion: false diff --git a/pom.xml b/pom.xml index f8e84d6..ff74342 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ com.kingsrook qbit-build-parent - 1.4.0 + 1.5.1 com.kingsrook.qbits @@ -78,11 +78,24 @@ + + + + + com.kingsrook.qqq + qqq-bom-pom + 0.40.0 + pom + import + + + + com.kingsrook.qqq qqq-backend-core - 0.9999.0 + 0.40.0 com.kingsrook.qqq @@ -97,7 +110,7 @@ com.kingsrook.qqq qqq-frontend-material-dashboard - 0.9999.0 + 0.40.0 -- 2.54.0