From def7c8a86e9b710f8c26d483c7d860e33795e858 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 26 Apr 2021 19:17:59 -0400 Subject: [PATCH 1/2] trying full workflow lifecycle --- .github/workflows/push_or_merge_to_main.yml | 7 ++----- .github/workflows/release_main.yml | 2 +- build.gradle | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/push_or_merge_to_main.yml b/.github/workflows/push_or_merge_to_main.yml index 2926f7c..09927ae 100644 --- a/.github/workflows/push_or_merge_to_main.yml +++ b/.github/workflows/push_or_merge_to_main.yml @@ -8,12 +8,9 @@ jobs: build: runs-on: ubuntu-latest env: - BUILD_TYPE: "RELEASE" + BUILD_TYPE: "MERGE" OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} - SIGNING_KEY: ${{ secrets.SIGNING_KEY }} - SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} steps: - run: echo -e "PUSH/MERGE to main" - name: Set up JDK 8 @@ -27,4 +24,4 @@ jobs: run: chmod +x gradlew && ./gradlew clean test - name: Publish if: ${{ success() }} - run: ./gradlew -i signArchives signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository + run: ./gradlew -i publishToSonatype diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index f0e7623..ef428c4 100644 --- a/.github/workflows/release_main.yml +++ b/.github/workflows/release_main.yml @@ -28,4 +28,4 @@ jobs: run: chmod +x gradlew && ./gradlew clean test - name: Publish if: ${{ success() }} - run: ./gradlew -i sign publishToSonatype closeAndReleaseSonatypeStagingRepository + run: ./gradlew -i signArchives signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository diff --git a/build.gradle b/build.gradle index 8b0563d..a97651f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { id 'signing' } -def jarVersion = "1.0.1" +def jarVersion = "1.0.2" group = 'io.nats' def isPr = System.getenv("BUILD_TYPE") == "PR" From 0bf148278c40149ed680dcec30d0479405ecab60 Mon Sep 17 00:00:00 2001 From: scottf Date: Mon, 26 Apr 2021 19:26:19 -0400 Subject: [PATCH 2/2] trying full workflow lifecycle again --- build.gradle | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index a97651f..a7d6607 100644 --- a/build.gradle +++ b/build.gradle @@ -118,11 +118,13 @@ publishing { } } -signing { - def signingKeyId = System.getenv('SIGNING_KEY_ID') - def signingKey = System.getenv('SIGNING_KEY') - def signingPassword = System.getenv('SIGNING_PASSWORD') - useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) - sign configurations.archives - sign publishing.publications.mavenJava -} +if (isRelease) { + signing { + def signingKeyId = System.getenv('SIGNING_KEY_ID') + def signingKey = System.getenv('SIGNING_KEY') + def signingPassword = System.getenv('SIGNING_PASSWORD') + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + sign configurations.archives + sign publishing.publications.mavenJava + } +} \ No newline at end of file