limit sonatype snapshot deployments

peterkir · chrisrueger · commit acc6eae2871e · 2026-01-07T16:11:30.000+01:00
Signed-off-by: Peter Kirschner &lt;peter@klib.io&gt;
diff --git a/.github/scripts/ci-build.sh b/.github/scripts/ci-build.sh
@@ -19,6 +19,11 @@ fi
 # build
 ./gradlew --no-daemon --version
 ./mvnw --version
-./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :build "$@"
+./gradlew \
+    --no-daemon \
+    -Dmaven.repo.local=dist/m2 \
+    -Dbnd.sonatype.release.description=${GITHUB_JOB}_${GITHUB_RUN_NUMBER} \
+    --continue \
+    :build "$@"
 ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :gradle-plugins:build
 ./mvnw -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress install
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
@@ -121,6 +121,7 @@ jobs:
       id: publish
       if: ${{ matrix.canonical }}
       run: |
+        env | sort
         ./.github/scripts/ci-publish.sh
       env:
         CANONICAL: ${{ matrix.canonical }}
diff --git a/biz.aQute.repository/src/aQute/maven/provider/Releaser.java b/biz.aQute.repository/src/aQute/maven/provider/Releaser.java
@@ -359,7 +359,8 @@ private void uploadToPortal(File deploymentBundle) throws Exception {
 			DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss.SSS");
 			String msg = String.format("uploaded from bnd on %s", LocalDateTime.now()
 				.format(dtf));
-			String encodedMsg = URLEncoder.encode(msg, StandardCharsets.UTF_8)
+			String sonatypeDesc = System.getProperty("bnd.sonatype.release.description", msg);
+			String encodedMsg = URLEncoder.encode(sonatypeDesc, StandardCharsets.UTF_8)
 				.replace("+", "%20");
 			String paramName = !encodedMsg.isEmpty() ? "name=" + encodedMsg : "";
 			urlQueryParamJoiner.add(paramName);
diff --git a/biz.aQute.repository/test/aQute/bnd/repository/maven/provider/SonatypeDeploymentTest.java b/biz.aQute.repository/test/aQute/bnd/repository/maven/provider/SonatypeDeploymentTest.java
@@ -319,6 +319,13 @@ private static boolean hasRequiredEnvironment() {
 		for (String var : vars) {
 			existing = existing && ensureEnvVar(var);
 		}
+		if ("true".equals(System.getenv("GITHUB_ACTIONS"))) {
+			// Running in GitHub Actions
+			if ("false".equals(System.getenv("CANONICAL"))) {
+				System.out.println("skipping tests cause in GITHUB but NOT in CANONICAL");
+				existing = false;
+			}
+		}
 		return existing;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,13 @@ private static boolean hasRequiredEnvironment() {`
`319`	`319`	`for (String var : vars) {`
`320`	`320`	`existing = existing && ensureEnvVar(var);`
`321`	`321`	`}`
	`322`	`+ if ("true".equals(System.getenv("GITHUB_ACTIONS"))) {`
	`323`	`+ // Running in GitHub Actions`
	`324`	`+ if ("false".equals(System.getenv("CANONICAL"))) {`
	`325`	`+ System.out.println("skipping tests cause in GITHUB but NOT in CANONICAL");`
	`326`	`+ existing = false;`
	`327`	`+ }`
	`328`	`+ }`
`322`	`329`	`return existing;`
`323`	`330`	`}`
`324`	`331`