From 24e143d2747fd62e972255ed1e763a72bbc8892b Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Thu, 21 Aug 2025 12:23:23 +0200 Subject: [PATCH] Fix publication scripts --- .../release-candidate-to-maven-central.yml | 2 +- .github/workflows/release-to-maven-central.yml | 2 +- build.gradle | 16 +++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-candidate-to-maven-central.yml b/.github/workflows/release-candidate-to-maven-central.yml index 26b60aae..a01edefe 100644 --- a/.github/workflows/release-candidate-to-maven-central.yml +++ b/.github/workflows/release-candidate-to-maven-central.yml @@ -19,7 +19,7 @@ jobs: echo "${{secrets.SIGNING_SECRET_KEY_RING_FILE}}" > ~/.gradle/secring.gpg.b64 base64 -d ~/.gradle/secring.gpg.b64 > ~/.gradle/secring.gpg - name: Publish - run: ./gradlew publishToSonatype -Prelease.useLastTag=true -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=openrndr -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) + run: ./gradlew publishToSonatype sleep closeSonatypeStagingRepository -Prelease.useLastTag=true -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=openrndr -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) env: OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}} OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}} diff --git a/.github/workflows/release-to-maven-central.yml b/.github/workflows/release-to-maven-central.yml index f645d97b..c12c17e2 100644 --- a/.github/workflows/release-to-maven-central.yml +++ b/.github/workflows/release-to-maven-central.yml @@ -21,7 +21,7 @@ jobs: echo "${{secrets.SIGNING_SECRET_KEY_RING_FILE}}" > ~/.gradle/secring.gpg.b64 base64 -d ~/.gradle/secring.gpg.b64 > ~/.gradle/secring.gpg - name: Publish - run: ./gradlew publishToSonatype -Prelease.useLastTag=true -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=openrndr -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) + run: ./gradlew publishToSonatype sleep closeSonatypeStagingRepository -Prelease.useLastTag=true -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=openrndr -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) env: OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}} OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}} diff --git a/build.gradle b/build.gradle index 6b86b515..c656d16c 100644 --- a/build.gradle +++ b/build.gradle @@ -93,10 +93,10 @@ group = "org.openrndr.extra" nexusPublishing { repositories { sonatype { - username.set(findProperty("ossrhUsername")?.toString() ?: System.getenv("OSSRH_USERNAME")) - password.set(findProperty("ossrhPassword")?.toString() ?: System.getenv("OSSRH_PASSWORD")) - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots")) + username.set(findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")) + password.set(findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")) + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) } } } @@ -116,7 +116,13 @@ dependencies { dokka(project(subproject.path)) } } - +class SleepTask extends DefaultTask { + @TaskAction + void action() { + sleep(60 * 5 * 1000) + } +} +tasks.register("sleep", SleepTask) gradle.buildFinished { println("\n") println("orx = \"${version}\"")