diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index aedad937..88f9437f 100644 --- a/.github/workflows/release-perform.yml +++ b/.github/workflows/release-perform.yml @@ -1,18 +1,28 @@ -name: Quarkiverse Prepare Release - +name: Quarkiverse Perform Release +run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release on: - pull_request: - types: [ closed ] - paths: - - '.github/project.yml' + push: + tags: + - '*' + workflow_dispatch: + inputs: + tag: + description: 'Tag to release' + required: true + +permissions: + attestations: write + id-token: write + contents: read concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - prepare-release: - name: Prepare Release - if: ${{ github.event.pull_request.merged == true}} - uses: quarkiverse/.github/.github/workflows/prepare-release.yml@main + perform-release: + name: Perform Release + uses: quarkiverse/.github/.github/workflows/perform-release.yml@main secrets: inherit + with: + version: ${{github.event.inputs.tag || github.ref_name}} diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml index 88f9437f..aedad937 100644 --- a/.github/workflows/release-prepare.yml +++ b/.github/workflows/release-prepare.yml @@ -1,28 +1,18 @@ -name: Quarkiverse Perform Release -run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release -on: - push: - tags: - - '*' - workflow_dispatch: - inputs: - tag: - description: 'Tag to release' - required: true +name: Quarkiverse Prepare Release -permissions: - attestations: write - id-token: write - contents: read +on: + pull_request: + types: [ closed ] + paths: + - '.github/project.yml' concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - perform-release: - name: Perform Release - uses: quarkiverse/.github/.github/workflows/perform-release.yml@main + prepare-release: + name: Prepare Release + if: ${{ github.event.pull_request.merged == true}} + uses: quarkiverse/.github/.github/workflows/prepare-release.yml@main secrets: inherit - with: - version: ${{github.event.inputs.tag || github.ref_name}}