From 6c0157a179211fc8405fd969bcc6c63766dc6c0d Mon Sep 17 00:00:00 2001 From: Peter Skopek Date: Wed, 11 Sep 2024 10:11:36 +0200 Subject: [PATCH] Simplify relase workflow by merging x-keycloak-client.yml to relase.yml Closes #keycloak-client-45 Signed-off-by: Peter Skopek --- .github/workflows/release.yml | 45 ++++++++++----- .github/workflows/x-keycloak-client.yml | 75 ------------------------- 2 files changed, 30 insertions(+), 90 deletions(-) delete mode 100644 .github/workflows/x-keycloak-client.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84c842a..dac871b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,8 +23,8 @@ defaults: jobs: - repo-prep: - name: Prepare repository + release: + name: Release keycloak-client runs-on: ubuntu-latest steps: - name: Show-inputs @@ -33,10 +33,23 @@ jobs: echo "Release branch: ${{ inputs.branch }} " >> $GITHUB_STEP_SUMMARY echo "Workflow branch: ${{ github.ref_name }} " >> $GITHUB_STEP_SUMMARY echo "Deploy skip: ${{ inputs.deploy-skip }} " >> $GITHUB_STEP_SUMMARY + - name: Checkout uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} + + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + server-id: kc-rel-repository + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + - name: Create version change commit run: | ./set-version.sh ${{ inputs.version }} @@ -48,16 +61,18 @@ jobs: - name: Push tag with version changes run: git push --force origin refs/tags/${{ inputs.version }} - keycloak-client: - name: Keycloak Client - needs: repo-prep - uses: ./.github/workflows/x-keycloak-client.yml - with: - mvn-url: https://s01.oss.sonatype.org/service/local/repositories/releases/content/ - tag: ${{ inputs.version }} - deploy-skip: ${{ inputs.deploy-skip }} - secrets: - MVN_USERNAME: ${{ secrets.MVN_USERNAME }} - MVN_TOKEN: ${{ secrets.MVN_TOKEN }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + - name: Deploy to Maven + env: + MAVEN_ID: kc-rel-repository + MAVEN_URL: https://s01.oss.sonatype.org/service/local/repositories/releases/content/ + MAVEN_USERNAME: ${{ secrets.MVN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MVN_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: | + MVN_HTTP_CONFIG="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120" + mvn -s ./.github/mvn-rel-settings.xml -nsu -B -Pgpg,jboss-release -Djboss.releases.repo.id=$MAVEN_ID -Dmaven.deploy.skip=${{ inputs.deploy-skip }} -Djboss.releases.repo.url=$MAVEN_URL -Djboss.snapshots.repo.id=$MAVEN_ID -Djboss.snapshots.repo.url=$MAVEN_URL -DskipTests -DskipTestsuite -DretryFailedDeploymentCount=10 -DautoReleaseAfterClose=true $MVN_HTTP_CONFIG clean deploy | tee deploy.log + + - name: Show Maven artifacts + run: | + cat deploy.log | grep "Uploaded to" | grep -o "https://[^ ]*" | grep -v '.xml$' | grep -v '.asc$' | grep -v '.pom$' | grep -v 'javadoc.jar$' | grep -v 'sources.jar$' | xargs -I {} echo "{} " >> $GITHUB_STEP_SUMMARY + diff --git a/.github/workflows/x-keycloak-client.yml b/.github/workflows/x-keycloak-client.yml deleted file mode 100644 index 44d1d86..0000000 --- a/.github/workflows/x-keycloak-client.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: X Keycloak Client - -on: - workflow_call: - inputs: - mvn-url: - description: "Maven repository URL" - required: true - type: string - tag: - description: "Final tag for the release" - required: true - type: string - deploy-skip: - description: "To skip deploy to the maven repository set to 'true'" - required: false - type: string - default: false - path-final: - description: "Path where the final tag will be checked out" - required: false - type: string - default: keycloak-client-final - secrets: - MVN_USERNAME: - required: true - MVN_TOKEN: - required: true - GPG_PASSPHRASE: - required: true - GPG_PRIVATE_KEY: - required: true - -defaults: - run: - shell: bash - -jobs: - release: - runs-on: ubuntu-latest - - steps: - - name: Setup Java - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - server-id: kc-rel-repository - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - - - name: Checkout Repository - uses: actions/checkout@v4 - with: - path: ${{ inputs.path-final }} - ref: ${{ inputs.tag }} - - - name: Deploy to Maven - env: - MAVEN_ID: kc-rel-repository - MAVEN_URL: ${{ inputs.mvn-url }} - MAVEN_USERNAME: ${{ secrets.MVN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MVN_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run: | - MVN_HTTP_CONFIG="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120" - cd ${{ inputs.path-final }} - mvn -s ./.github/mvn-rel-settings.xml -nsu -B -Pgpg,jboss-release,all -Djboss.releases.repo.id=$MAVEN_ID -Dmaven.deploy.skip=${{ inputs.deploy-skip }} -Djboss.releases.repo.url=${{ inputs.mvn-url }} -Djboss.snapshots.repo.id=$MAVEN_ID -Djboss.snapshots.repo.url=${{ inputs.mvn-url }} -DskipTests -DskipTestsuite -DretryFailedDeploymentCount=10 -DautoReleaseAfterClose=true $MVN_HTTP_CONFIG clean deploy | tee deploy.log - - - name: Show Maven artifacts - run: | - cd ${{ inputs.path-final }} - cat deploy.log | grep "Uploaded to" | grep -o "https://[^ ]*" | grep -v '.xml$' | grep -v '.asc$' | grep -v '.pom$' | grep -v 'javadoc.jar$' | grep -v 'sources.jar$' | xargs -I {} echo "{} " >> $GITHUB_STEP_SUMMARY