From 97b764640fc1d4311634d9ef32c2ee040e03167a Mon Sep 17 00:00:00 2001 From: James Maes Date: Tue, 13 Oct 2026 14:38:30 -0500 Subject: [PATCH 1/2] ci: hotfix/* pushes no longer publish Removes publish_hotfix_release: a hotfix/* branch push published a GA release to Maven Central with no tag or review (QRun-IO/qbit-cdn#12, QRun-IO/qqq#1121). hotfix/* branches now run test_only; a hotfix release publishes from a reviewed vX.Y.Z tag through publish_release. Co-Authored-By: Claude Opus 5.5 --- .circleci/config.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7aa4b2..70e0ef2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ workflows: context: [qqq-maven-registry-credentials] filters: branches: - ignore: /(develop|main|release/.*|hotfix/.*|integration.*)/ + ignore: /(develop|main|release/.*|integration.*)/ tags: only: [] @@ -44,13 +44,3 @@ workflows: ignore: /.*/ tags: only: [/v.*/] - - publish_hotfix_release: - jobs: - - qqq-orb/mvn_publish: - context: [qqq-maven-registry-credentials] - branch_type: hotfix - filters: - branches: - only: - - /hotfix\/.*/ -- 2.54.0 From e708c61a1d35b5b188af850ab8c2a804ef09226f Mon Sep 17 00:00:00 2001 From: James Maes Date: Tue, 13 Oct 2026 14:59:56 -0500 Subject: [PATCH 2/2] ci: keep apt unattended (configure-package-install pre-step) Every job hung in "Install Java 21" on the needrestart dialog until the 10m no-output timeout. Adds the standard's configure-package-install command (QRUN-QBIT-REPO-STANDARD C1) as a pre-step to each orb job. Co-Authored-By: Claude Opus 5.5 --- .circleci/config.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70e0ef2..97bb018 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,10 +3,24 @@ version: 2.1 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 + + workflows: test_only: jobs: - qqq-orb/mvn_test_only: + pre-steps: + - configure-package-install context: [qqq-maven-registry-credentials] filters: branches: @@ -17,6 +31,8 @@ workflows: publish_snapshot: jobs: - qqq-orb/mvn_publish: + pre-steps: + - configure-package-install context: [qqq-maven-registry-credentials] branch_type: snapshot filters: @@ -27,6 +43,8 @@ workflows: publish_release_candidate: jobs: - qqq-orb/mvn_publish: + pre-steps: + - configure-package-install context: [qqq-maven-registry-credentials] branch_type: release_candidate filters: @@ -37,6 +55,8 @@ workflows: publish_release: jobs: - qqq-orb/mvn_publish: + pre-steps: + - configure-package-install context: [qqq-maven-registry-credentials] branch_type: release filters: -- 2.54.0