From 9c9cba320b2684c46166eaaa304df6bc81a66f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Thu, 12 Dec 2024 22:55:05 +0100 Subject: [PATCH] Finish deployment with a release for non-snapshot versions --- .../actions/{release => deploy}/action.yml | 10 ++++--- .github/workflows/daily-deploy.yml | 2 +- .github/workflows/release.yml | 2 +- pom.xml | 26 ++++++++++++++++++- 4 files changed, 33 insertions(+), 7 deletions(-) rename .github/actions/{release => deploy}/action.yml (84%) diff --git a/.github/actions/release/action.yml b/.github/actions/deploy/action.yml similarity index 84% rename from .github/actions/release/action.yml rename to .github/actions/deploy/action.yml index 1490b69e8..bae593396 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/deploy/action.yml @@ -1,5 +1,5 @@ -name: 'Release Quarkus QE Test Framework' -description: 'Releases Quarkus QE Test Framework' +name: 'Deploy Quarkus QE Test Framework' +description: 'Deploys Quarkus QE Test Framework' inputs: repository-id: description: 'Must match a repository id present in of the POM file distributionManagement repositories' @@ -33,17 +33,19 @@ runs: run: mvn -B versions:set -DnewVersion=$NEW_FRAMEWORK_VERSION env: NEW_FRAMEWORK_VERSION: ${{ inputs.release-version }} - - name: Maven release ${{ inputs.release-version }} + - name: Maven deploy ${{ inputs.release-version }} shell: bash run: | mvn -B -DskipTests -DskipITs \ -DretryFailedDeploymentCount=3 \ - -Prelease,framework \ + -Pdeploy,framework \ + -Prelease=$RELEASE \ clean deploy env: MAVEN_USERNAME: ${{ inputs.ossrh-username }} MAVEN_PASSWORD: ${{ inputs.ossrh-token }} MAVEN_GPG_PASSPHRASE: ${{ inputs.gpg-passphrase }} + RELEASE: ${{ ! endsWith(inputs.release-version, 'SNAPSHOT') }} - name: Delete Local Artifacts From Cache shell: bash run: rm -r ~/.m2/repository/io/quarkus/qe diff --git a/.github/workflows/daily-deploy.yml b/.github/workflows/daily-deploy.yml index 0eed02d8a..ae603ae3f 100644 --- a/.github/workflows/daily-deploy.yml +++ b/.github/workflows/daily-deploy.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/release + - uses: ./.github/actions/deploy with: repository-id: 'ossrh' release-version: '999-SNAPSHOT' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3468bb28a..2ab044ebe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: with: github-token: ${{secrets.GITHUB_TOKEN}} metadata-file-path: '.github/project.yml' - - uses: ./.github/actions/release + - uses: ./.github/actions/deploy with: repository-id: 'oss.sonatype' release-version: ${{steps.metadata.outputs.current-version}} diff --git a/pom.xml b/pom.xml index 8dd21c0ac..f382809d0 100644 --- a/pom.xml +++ b/pom.xml @@ -577,7 +577,7 @@ - release + deploy @@ -630,6 +630,30 @@ + + release + + + release + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true + + https://s01.oss.sonatype.org/ + oss.sonatype + true + 60 + + + + + run-cli-tests