From 80a8f9f1d54e5871f575a9e26478011fb740b644 Mon Sep 17 00:00:00 2001 From: Steven Wong Date: Thu, 25 Jul 2024 22:25:14 +0800 Subject: [PATCH 1/5] Update codeowner file with new GitHub team name --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 60f116c..7958e8b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @auth0/dx-sdks-engineer +* @auth0/project-dx-sdks-engineer-codeowner From 081ebdc9e47f41544208fe1844c20091ae996edf Mon Sep 17 00:00:00 2001 From: tanya-sinha_atko <“sinha.tanya26@gmail.com”> Date: Mon, 28 Oct 2024 21:24:28 +0530 Subject: [PATCH 2/5] updated to ossr token --- .github/actions/maven-publish/action.yml | 17 ++++++++--------- .github/workflows/java-release.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index ee47706..a50743b 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -3,7 +3,7 @@ name: Publish release to Java inputs: ossr-username: required: true - ossr-password: + ossr-token: required: true signing-key: required: true @@ -33,12 +33,11 @@ runs: - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 - - name: Publish Java + - name: Publish Android/Java Packages to Maven shell: bash - if: inputs.is-android == 'false' - run: ./gradlew clean assemble sign publishMavenJavaPublicationToMavenRepository -PisSnapshot=false -Pversion="${{ inputs.version }}" -PossrhUsername="${{ inputs.ossr-username }}" -PossrhPassword="${{ inputs.ossr-password }}" -PsigningKey="${{ inputs.signing-key }}" -PsigningPassword="${{ inputs.signing-password }}" - - - name: Publish Android - shell: bash - if: inputs.is-android == 'true' - run: ./gradlew clean assemble sign publishAndroidLibraryPublicationToMavenRepository -PisSnapshot=false -Pversion="${{ inputs.version }}" -PossrhUsername="${{ inputs.ossr-username }}" -PossrhPassword="${{ inputs.ossr-password }}" -PsigningKey="${{ inputs.signing-key }}" -PsigningPassword="${{ inputs.signing-password }}" + run: ./gradlew publish -PisSnapshot=false --stacktrace + env: + MAVEN_USERNAME: ${{ inputs.ossr-username }} + MAVEN_PASSWORD: ${{ inputs.ossr-token }} + SIGNING_KEY: ${{ inputs.signing-key}} + SIGNING_PASSWORD: ${{ inputs.signing-password}} \ No newline at end of file diff --git a/.github/workflows/java-release.yml b/.github/workflows/java-release.yml index 3f81eb1..6795ffa 100644 --- a/.github/workflows/java-release.yml +++ b/.github/workflows/java-release.yml @@ -12,7 +12,7 @@ on: secrets: ossr-username: required: true - ossr-password: + ossr-token: required: true signing-key: required: true @@ -73,7 +73,7 @@ jobs: is-android: ${{ inputs.is-android }} version: ${{ steps.get_version.outputs.version }} ossr-username: ${{ secrets.ossr-username }} - ossr-password: ${{ secrets.ossr-password }} + ossr-token: ${{ secrets.ossr-token }} signing-key: ${{ secrets.signing-key }} signing-password: ${{ secrets.signing-password }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63482cc..17648ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: is-android: false secrets: ossr-username: ${{ secrets.OSSR_USERNAME }} - ossr-password: ${{ secrets.OSSR_PASSWORD }} + ossr-token: ${{ secrets.OSSR_TOKEN }} signing-key: ${{ secrets.SIGNING_KEY }} signing-password: ${{ secrets.SIGNING_PASSWORD }} github-token: ${{ secrets.GITHUB_TOKEN }} From d5150ba2435f64b8e3faf30dea5de22289d5bd4c Mon Sep 17 00:00:00 2001 From: tanya-sinha_atko <“sinha.tanya26@gmail.com”> Date: Mon, 28 Oct 2024 22:54:43 +0530 Subject: [PATCH 3/5] modified workflow --- .github/actions/maven-publish/action.yml | 4 ---- .github/workflows/java-release.yml | 5 ----- .github/workflows/release.yml | 1 - 3 files changed, 10 deletions(-) diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index a50743b..e2436c5 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -11,10 +11,6 @@ inputs: required: true java-version: required: true - is-android: - required: true - version: - required: true runs: using: composite diff --git a/.github/workflows/java-release.yml b/.github/workflows/java-release.yml index 6795ffa..ddce3e5 100644 --- a/.github/workflows/java-release.yml +++ b/.github/workflows/java-release.yml @@ -6,9 +6,6 @@ on: java-version: required: true type: string - is-android: - required: true - type: string secrets: ossr-username: required: true @@ -70,8 +67,6 @@ jobs: - uses: ./.github/actions/maven-publish with: java-version: ${{ inputs.java-version }} - is-android: ${{ inputs.is-android }} - version: ${{ steps.get_version.outputs.version }} ossr-username: ${{ secrets.ossr-username }} ossr-token: ${{ secrets.ossr-token }} signing-key: ${{ secrets.signing-key }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 17648ff..715a0bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,6 @@ jobs: uses: ./.github/workflows/java-release.yml with: java-version: 8.0.382-tem - is-android: false secrets: ossr-username: ${{ secrets.OSSR_USERNAME }} ossr-token: ${{ secrets.OSSR_TOKEN }} From 9bc85d578d407bd1816e4ca8389c3bb0cbcadfc3 Mon Sep 17 00:00:00 2001 From: tanya732 <“sinha.tanya26@gmail.com”> Date: Thu, 31 Oct 2024 09:36:23 +0530 Subject: [PATCH 4/5] Revert "updated to ossr token" This reverts commit 081ebdc9e47f41544208fe1844c20091ae996edf. --- .github/actions/maven-publish/action.yml | 17 +++++++++-------- .github/workflows/java-release.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index e2436c5..d7ba679 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -3,7 +3,7 @@ name: Publish release to Java inputs: ossr-username: required: true - ossr-token: + ossr-password: required: true signing-key: required: true @@ -29,11 +29,12 @@ runs: - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 - - name: Publish Android/Java Packages to Maven + - name: Publish Java shell: bash - run: ./gradlew publish -PisSnapshot=false --stacktrace - env: - MAVEN_USERNAME: ${{ inputs.ossr-username }} - MAVEN_PASSWORD: ${{ inputs.ossr-token }} - SIGNING_KEY: ${{ inputs.signing-key}} - SIGNING_PASSWORD: ${{ inputs.signing-password}} \ No newline at end of file + if: inputs.is-android == 'false' + run: ./gradlew clean assemble sign publishMavenJavaPublicationToMavenRepository -PisSnapshot=false -Pversion="${{ inputs.version }}" -PossrhUsername="${{ inputs.ossr-username }}" -PossrhPassword="${{ inputs.ossr-password }}" -PsigningKey="${{ inputs.signing-key }}" -PsigningPassword="${{ inputs.signing-password }}" + + - name: Publish Android + shell: bash + if: inputs.is-android == 'true' + run: ./gradlew clean assemble sign publishAndroidLibraryPublicationToMavenRepository -PisSnapshot=false -Pversion="${{ inputs.version }}" -PossrhUsername="${{ inputs.ossr-username }}" -PossrhPassword="${{ inputs.ossr-password }}" -PsigningKey="${{ inputs.signing-key }}" -PsigningPassword="${{ inputs.signing-password }}" diff --git a/.github/workflows/java-release.yml b/.github/workflows/java-release.yml index ddce3e5..f913edd 100644 --- a/.github/workflows/java-release.yml +++ b/.github/workflows/java-release.yml @@ -9,7 +9,7 @@ on: secrets: ossr-username: required: true - ossr-token: + ossr-password: required: true signing-key: required: true @@ -68,7 +68,7 @@ jobs: with: java-version: ${{ inputs.java-version }} ossr-username: ${{ secrets.ossr-username }} - ossr-token: ${{ secrets.ossr-token }} + ossr-password: ${{ secrets.ossr-password }} signing-key: ${{ secrets.signing-key }} signing-password: ${{ secrets.signing-password }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 715a0bc..ead761f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: java-version: 8.0.382-tem secrets: ossr-username: ${{ secrets.OSSR_USERNAME }} - ossr-token: ${{ secrets.OSSR_TOKEN }} + ossr-password: ${{ secrets.OSSR_PASSWORD }} signing-key: ${{ secrets.SIGNING_KEY }} signing-password: ${{ secrets.SIGNING_PASSWORD }} github-token: ${{ secrets.GITHUB_TOKEN }} From 0c9870cdb6647cae0fe8a64c3089e824a4cb8c69 Mon Sep 17 00:00:00 2001 From: tanya732 <“sinha.tanya26@gmail.com”> Date: Thu, 31 Oct 2024 09:36:52 +0530 Subject: [PATCH 5/5] Revert "modified workflow" This reverts commit d5150ba2435f64b8e3faf30dea5de22289d5bd4c. --- .github/actions/maven-publish/action.yml | 4 ++++ .github/workflows/java-release.yml | 5 +++++ .github/workflows/release.yml | 1 + 3 files changed, 10 insertions(+) diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index d7ba679..ee47706 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -11,6 +11,10 @@ inputs: required: true java-version: required: true + is-android: + required: true + version: + required: true runs: using: composite diff --git a/.github/workflows/java-release.yml b/.github/workflows/java-release.yml index f913edd..3f81eb1 100644 --- a/.github/workflows/java-release.yml +++ b/.github/workflows/java-release.yml @@ -6,6 +6,9 @@ on: java-version: required: true type: string + is-android: + required: true + type: string secrets: ossr-username: required: true @@ -67,6 +70,8 @@ jobs: - uses: ./.github/actions/maven-publish with: java-version: ${{ inputs.java-version }} + is-android: ${{ inputs.is-android }} + version: ${{ steps.get_version.outputs.version }} ossr-username: ${{ secrets.ossr-username }} ossr-password: ${{ secrets.ossr-password }} signing-key: ${{ secrets.signing-key }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ead761f..63482cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,7 @@ jobs: uses: ./.github/workflows/java-release.yml with: java-version: 8.0.382-tem + is-android: false secrets: ossr-username: ${{ secrets.OSSR_USERNAME }} ossr-password: ${{ secrets.OSSR_PASSWORD }}