Compare commits

..
Author SHA1 Message Date
james.maesandCodex 644a58cee1 ci: adopt shared orb 0.7.17
Co-Authored-By: Codex <noreply@openai.com>
2026-10-21 14:12:44 -05:00
8 changed files with 41 additions and 37 deletions

No files matched your search

-1
View File
@@ -1 +0,0 @@
Acceptance: a fresh protected-branch build must publish through the scheduled trusted publisher and resolve from an empty Maven cache.
-3
View File
@@ -1,3 +0,0 @@
Organization-scoped CI qualification. Workflow implementation lives in platform-ci; enrollment lives in ci-policy.
Shared CI tooling visibility approved and public; qualify public consumer access.
+2 -2
View File
@@ -1,12 +1,12 @@
version: 2.1
setup: true
orbs:
qqq-orb: kingsrook/qqq-orb@0.8
qqq-orb: kingsrook/qqq-orb@0.7.17
workflows:
setup:
jobs:
- qqq-orb/generate_pipeline:
orb_version: '0.8'
orb_version: 0.7.17
filters:
branches:
ignore: automation/qbit-rc-pending
-7
View File
@@ -1,7 +0,0 @@
name: build
on:
push:
jobs:
maven:
uses: self:KofTwentyTwo/ci-workflows/.gitea/workflows/maven.yaml@v1
secrets: inherit
+1 -1
View File
@@ -1,5 +1,5 @@
profile: qbit
orb_version: '0.8'
orb_version: 0.7.17
default_branch: develop
java_version: '21'
browsers: true
+1 -1
View File
@@ -24,7 +24,7 @@ This QBit provides automatic tracing for QQQ processes. Every execution is logge
### Prerequisites
- QQQ application (v4.1.0+)
- QQQ application (v4.0.0+)
- Database backend configured
### Installation
+36 -10
View File
@@ -23,13 +23,12 @@
<properties>
<revision>0.3.0-SNAPSHOT</revision>
<qqq.version>4.1.0-RC.26</qqq.version>
</properties>
<parent>
<groupId>com.kingsrook</groupId>
<artifactId>qbit-build-parent</artifactId>
<version>2.2.1</version>
<version>2.0.0</version>
</parent>
<groupId>com.kingsrook.qbits</groupId>
@@ -70,14 +69,6 @@
<dependencyManagement>
<dependencies>
<!-- Published QQQ 4.1 core (minimum QQQ 4.1), imported ahead of the parent's BOM. -->
<dependency>
<groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-bom-pom</artifactId>
<version>${qqq.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
@@ -107,4 +98,39 @@
</dependency>
</dependencies>
<profiles>
<!-- Opt-in check against the next qqq line: mvn -B verify -Pqqq-snapshot -->
<!-- (override the version with -Dqqq.snapshot.version=...). Default builds -->
<!-- take the qqq version only from qbit-build-parent. -->
<profile>
<id>qqq-snapshot</id>
<properties>
<qqq.snapshot.version>4.1.0-SNAPSHOT</qqq.snapshot.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-bom-pom</artifactId>
<version>${qqq.snapshot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
<repository>
<id>sonatype-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>
</project>
@@ -94,18 +94,7 @@ class ProcessTraceBackendActivityStatsManagerTest
manager.add(processTraceId, key, 1, 2, 3);
manager.setCleanupIntervalMillis(5);
manager.setCleanupMaxAge(20);
// Wait for the scheduled cleanup rather than assuming a shared CI runner
// will schedule the background thread within 50 milliseconds.
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
while(System.nanoTime() < deadline)
{
var messages = collectingLogger.getCollectedMessages();
if(!messages.isEmpty() && messages.get(messages.size() - 1).getMessage().contains("\"size\":0"))
{
break;
}
SleepUtils.sleep(5, TimeUnit.MILLISECONDS);
}
SleepUtils.sleep(50, TimeUnit.MILLISECONDS);
QLogger.deactivateCollectingLoggerForClass(ProcessTraceBackendActivityStatsManager.class);
assertThat(collectingLogger.getCollectedMessages()).anyMatch(clm -> clm.getMessage().contains("\"size\":1"));