ci: updated maven-publish action to perform the release

auth0 · May 28, 2024 · ecccb8c · ecccb8c
1 parent c53aeeb
commit ecccb8c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml
@@ -1,20 +1,19 @@
 name: Publish release to Java
 
 inputs:
+ java-version:
+ required: true
+
+secrets:
  ossr-username:
  required: true
- ossr-password:
+ ossr-token:
  required: true
  signing-key:
  required: true
  signing-password:
  required: true
- java-version:
- required: true
- is-android:
- required: true
- version:
- required: true
+
 
 runs:
  using: composite
@@ -33,12 +32,11 @@ runs:
 
  - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # [email protected]
 
- - name: Publish Java
- 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/Java Packages to Maven
+ run: ./gradlew publish -PisSnapshot=false
+ env:
+ MAVEN_USERNAME: ${{ secrets.ossr-username }}
+ MAVEN_PASSWORD: ${{ secrets.ossr-token }}
+ SIGNING_KEY: ${{ secrets.signing-key}}
+ SIGNING_PASSWORD: ${{ secrets.signing-password}}
 
- - name: Publish Android
- shell: bash
- if: inputs.is-android == 'true'
- run: ./gradlew clean assemble 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
@@ -6,13 +6,11 @@ on:
  java-version:
  required: true
  type: string
- is-android:
- required: true
- type: string
+
  secrets:
  ossr-username:
  required: true
- ossr-password:
+ ossr-token:
  required: true
  signing-key:
  required: true
@@ -68,12 +66,12 @@ jobs:
 
  # Publish the release to Maven
  - name: Publish package to Maven
-  run: ./gradlew publish -PisSnapshot=false
- env:
- MAVEN_USERNAME: ${{ secrets.OSSR_USERNAME }}
- MAVEN_PASSWORD: ${{ secrets.OSSR_TOKEN }}
- SIGNING_KEY: ${{ secrets.SIGNING_KEY}}
- SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD}}
+ - uses: ./.github/actions/maven-publish
+ secrets:
+ ossr-username: ${{ secrets.ossr-username }}
+ ossr-token: ${{ secrets.ossr-token }}
+ signing-key: ${{ secrets.signing-key}}
+ signing-password: ${{ secrets.signing-password}}
 
  # Create a release for the tag
  - uses: ./.github/actions/release-create

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,10 +18,9 @@ jobs:
  uses: ./.github/workflows/java-release.yml
  with:
  java-version: 8.0.402-zulu
- is-android: true
  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 }}