Skip to content

Commit

Permalink
Ecalc 1248 prerelease revert (#505)
Browse files Browse the repository at this point in the history
* Revert "chore: make prerelease behave differently with input vars (#504)"

This reverts commit ca27794.

* Revert "chore: make prerelease behave differently (#503)"

This reverts commit f234f8e.

* Revert "chore: add support to manually create prereleases (#501)"

This reverts commit 6a1afa3.
  • Loading branch information
TeeeJay authored May 31, 2024
1 parent b146eb4 commit bdbf385
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/on-manual-create-prerelease.yml

This file was deleted.

7 changes: 3 additions & 4 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand Down

0 comments on commit bdbf385

Please sign in to comment.