From 57d42a9d4da35cd6daa27cae84f132af7abbc344 Mon Sep 17 00:00:00 2001 From: Robert Crumbaugh Date: Thu, 15 Feb 2024 11:58:04 -0800 Subject: [PATCH 1/2] chore: better java publishing step names --- .github/workflows/sdk-generation.yaml | 8 +++++--- .github/workflows/sdk-publish.yaml | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sdk-generation.yaml b/.github/workflows/sdk-generation.yaml index 3e9d8177..38bbc8f1 100644 --- a/.github/workflows/sdk-generation.yaml +++ b/.github/workflows/sdk-generation.yaml @@ -1061,16 +1061,18 @@ jobs: java-version: "11" distribution: "corretto" cache: "gradle" - - run: |- + - name: Publish to Sonatype (legacy) + run: |- pwd ./gradlew publish --no-daemon - if: ${{ inputs.use_sonatype_central == 'false' }} + if: ${{ inputs.use_sonatype_central != 'true' }} env: MAVEN_USERNAME: ${{ secrets.ossrh_username }} MAVEN_PASSWORD: ${{ secrets.ossrh_password }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.java_gpg_secret_key }} ORG_GRADLE_PROJECT_signingPassphrase: ${{ secrets.java_gpg_passphrase }} - - run: |- + - name: Publish to Sonatype Central + run: |- pwd ./gradlew build sonatypeCentralUpload --no-daemon if: ${{ inputs.use_sonatype_central == 'true' }} diff --git a/.github/workflows/sdk-publish.yaml b/.github/workflows/sdk-publish.yaml index 3937f760..aa60decf 100644 --- a/.github/workflows/sdk-publish.yaml +++ b/.github/workflows/sdk-publish.yaml @@ -239,18 +239,20 @@ jobs: java-version: "11" distribution: "corretto" cache: "gradle" - - run: |- + - name: Publish to Sonatype (legacy) + run: |- pwd ./gradlew publish --no-daemon - if: ${{ inputs.use_sonatype_central == 'false' }} + if: ${{ inputs.use_sonatype_central != 'true' }} env: MAVEN_USERNAME: ${{ secrets.ossrh_username }} MAVEN_PASSWORD: ${{ secrets.ossrh_password }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.java_gpg_secret_key }} ORG_GRADLE_PROJECT_signingPassphrase: ${{ secrets.java_gpg_passphrase }} - - run: |- + - name: Publish to Sonatype Central + run: |- pwd - ./gradlew sonatypeCentralUpload --no-daemon + ./gradlew build sonatypeCentralUpload --no-daemon if: ${{ inputs.use_sonatype_central == 'true' }} env: SONATYPE_USERNAME: ${{ secrets.ossrh_username }} From 3db35e284849b0ae3f82f7be1b8ac5eb067dd0af Mon Sep 17 00:00:00 2001 From: Robert Crumbaugh Date: Thu, 15 Feb 2024 11:58:41 -0800 Subject: [PATCH 2/2] chore: better descriptions --- .github/workflows/sdk-generation.yaml | 2 +- .github/workflows/sdk-publish.yaml | 2 +- action.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sdk-generation.yaml b/.github/workflows/sdk-generation.yaml index 38bbc8f1..f6993e94 100644 --- a/.github/workflows/sdk-generation.yaml +++ b/.github/workflows/sdk-generation.yaml @@ -104,7 +104,7 @@ on: required: false type: string use_sonatype_central: - description: "When publishing the Java SDK, use to the Sonatype central portal" + description: "When publishing the Java SDK, use the Sonatype central portal" default: "false" required: false type: string diff --git a/.github/workflows/sdk-publish.yaml b/.github/workflows/sdk-publish.yaml index aa60decf..45ef5382 100644 --- a/.github/workflows/sdk-publish.yaml +++ b/.github/workflows/sdk-publish.yaml @@ -24,7 +24,7 @@ on: required: false type: string use_sonatype_central: - description: "When publishing the Java SDK, use to the Sonatype central portal" + description: "When publishing the Java SDK, use the Sonatype central portal" default: "false" required: false type: string diff --git a/action.yml b/action.yml index 5fde4c87..053a5592 100644 --- a/action.yml +++ b/action.yml @@ -111,7 +111,7 @@ inputs: default: "false" required: false use_sonatype_central: - description: "When publishing the Java SDK, use to the Sonatype central portal" + description: "When publishing the Java SDK, use the Sonatype central portal" default: "false" required: false publish_csharp: