diff --git a/.github/workflows/on-manual-create-prerelease.yml b/.github/workflows/on-manual-create-prerelease.yml deleted file mode 100644 index d0cb55529b..0000000000 --- a/.github/workflows/on-manual-create-prerelease.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: manually create prerelease - -on: - # Workflow dispatch is used for manual triggers - workflow_dispatch: - -jobs: - release-please: - uses: ./.github/workflows/release-please.yml - with: - versioning_strategy: 'prerelease' - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index bf7ae1514f..0ce036faa8 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -14,7 +14,6 @@ on: - always-bump-patch - always-bump-minor - always-bump-major - - prerelease # Workflow call is used for called from another workflow workflow_call: @@ -46,7 +45,7 @@ jobs: src/libecalc/version.py - uses: actions/checkout@v4 - name: Create vX.Y release branch (for simpler patching) - if normal release (not patching) - if: ${{ steps.release.outputs.release_created && env.VERSIONING_STRATEGY != 'always-bump-patch' && env.VERSIONING_STRATEGY != 'prerelease' }} + if: ${{ steps.release.outputs.release_created && env.VERSIONING_STRATEGY != 'always-bump-patch' }} run: | git checkout -b release/v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} ${{ steps.release.outputs.sha }} git push -u origin release/v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} @@ -63,11 +62,11 @@ jobs: uses: equinor/ecalc/.github/workflows/publish.yml@main secrets: pypi_token: ${{ secrets.PYPI_TOKEN }} - if: ${{ needs.release-please.outputs.release_created && inputs.versioning_strategy != 'prerelease' }} + if: ${{ needs.release-please.outputs.release_created }} create-jira-release: needs: release-please - if: ${{ needs.release-please.outputs.release_created && inputs.versioning_strategy != 'prerelease' }} + if: ${{ needs.release-please.outputs.release_created }} secrets: jira_release_webhook: ${{ secrets.JIRA_RELEASE_WEBHOOK }} uses: equinor/ecalc/.github/workflows/create-jira-release.yml@main