From 4283b886076261b2d4ed1c71e4f974cedda517ef Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Thu, 17 Oct 2024 10:24:31 +0100 Subject: [PATCH] Split and Reuse the Release workflow --- .github/workflows/prepare-release.yml | 18 +++++ .github/workflows/release.yml | 81 ++++++------------- .../{pre-release.yml => review-release.yml} | 2 +- 3 files changed, 43 insertions(+), 58 deletions(-) create mode 100644 .github/workflows/prepare-release.yml rename .github/workflows/{pre-release.yml => review-release.yml} (96%) diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml new file mode 100644 index 00000000..3d61f165 --- /dev/null +++ b/.github/workflows/prepare-release.yml @@ -0,0 +1,18 @@ +name: SmallRye Prepare Release + +on: + pull_request: + types: [ closed ] + paths: + - '.github/project.yml' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + prepare-release: + name: Prepare Release + if: ${{ github.event.pull_request.merged == true}} + uses: smallrye/.github/.github/workflows/prepare-release.yml@main + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 739cf103..7f6c6af1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,62 +1,29 @@ name: SmallRye Release - +run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release on: - pull_request: - types: [closed] - paths: - - '.github/project.yml' - -jobs: - release: - runs-on: ubuntu-latest - name: release - if: ${{github.event.pull_request.merged == true}} - env: - GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} + push: + tags: + - '*' + workflow_dispatch: + inputs: + tag: + description: 'Tag to release' + required: true - steps: - - uses: radcortez/project-metadata-action@main - name: retrieve project metadata - id: metadata - with: - github-token: ${{secrets.GITHUB_TOKEN}} - metadata-file-path: '.github/project.yml' +permissions: + attestations: write + id-token: write + # Needed for the publish-* workflows + contents: write - - uses: actions/checkout@v4 - with: - token: ${{secrets.RELEASE_TOKEN}} +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true - - name: Java setup - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - cache: maven - server-id: 'oss.sonatype' - server-username: 'MAVEN_DEPLOY_USERNAME' - server-password: 'MAVEN_DEPLOY_TOKEN' - gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}} - gpg-passphrase: 'MAVEN_GPG_PASSPHRASE' - - - name: maven release ${{steps.metadata.outputs.current-version}} - env: - MAVEN_DEPLOY_USERNAME: ${{secrets.MAVEN_DEPLOY_USERNAME}} - MAVEN_DEPLOY_TOKEN: ${{secrets.MAVEN_DEPLOY_TOKEN}} - MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}} - run: | - java -version - git config --global user.name "SmallRye CI" - git config --global user.email "smallrye@googlegroups.com" - git checkout -b release - mvn -B release:prepare -Prelease,coverage -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} - git checkout ${{github.base_ref}} - git rebase release - mvn -B release:perform -Prelease - git push - git push --tags - - - uses: radcortez/milestone-release-action@main - name: milestone release - with: - github-token: ${{secrets.GITHUB_TOKEN}} - milestone-title: ${{steps.metadata.outputs.current-version}} +jobs: + perform-release: + name: Perform Release + uses: smallrye/.github/.github/workflows/perform-release.yml@main + secrets: inherit + with: + version: ${{github.event.inputs.tag || github.ref_name}} diff --git a/.github/workflows/pre-release.yml b/.github/workflows/review-release.yml similarity index 96% rename from .github/workflows/pre-release.yml rename to .github/workflows/review-release.yml index 343d47e8..b6645f0e 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/review-release.yml @@ -1,4 +1,4 @@ -name: SmallRye Pre Release +name: SmallRye Review Release on: pull_request: