diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index c0a6188a87a..afc69cb2d1a 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -3,12 +3,12 @@ on: workflow_dispatch: inputs: version: + description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta format. example: 7.4.3 or 7.4.3-beta1' required: true - default: '7.x.x' workflow_call: inputs: version_call: - description: Needs to match, exactly, the name of a version + description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta format. example: 7.4.3 or 7.4.3-beta1' required: true type: string secrets: diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml deleted file mode 100644 index 3bf5a7b9ead..00000000000 --- a/.github/workflows/prepare-release.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Prepare release -on: - workflow_dispatch: - inputs: - version_input: - description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta format. example: 7.4.3 or 7.4.3-beta1' - required: true -jobs: - call-bump-version: - uses: grafana/grafana/.github/workflows/bump-version.yml@main - with: - version_call: ${{ github.event.inputs.version_input }} - secrets: - token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} - metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }} - call-update-changelog: - uses: grafana/grafana/.github/workflows/update-changelog.yml@main - with: - version_call: ${{ github.event.inputs.version_input }} - secrets: - token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} - metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }} - needs: call-bump-version diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index fe03bdeed01..268d5078697 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -4,11 +4,11 @@ on: inputs: version: required: true - description: Needs to match, exactly, the name of a milestone + description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta format. example: 7.4.3 or 7.4.3-beta1' workflow_call: inputs: version_call: - description: Needs to match, exactly, the name of a milestone + description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta format. example: 7.4.3 or 7.4.3-beta1' required: true type: string secrets: