Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:

determine_version:
name: Detect version bump
needs:
- lint
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.draft == false }}
uses: ./.github/workflows/workflow-determine-version-bump.yml
with:
Expand All @@ -58,8 +56,10 @@ jobs:

merge_prs:
name: Auto-merge PRs
needs: determine_version
if: ${{ needs.determine_version.result == 'success' && needs.determine_version.outputs.matching_pr == 'true' }}
needs:
- lint
- determine_version
if: ${{ needs.determine_version.result == 'success' && needs.determine_version.outputs.matching_pr == 'true' && needs.lint.result == 'success' }}
uses: ./.github/workflows/workflow-merge-pull-requests.yml
permissions:
contents: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow-compute-next-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ jobs:
case "$version_bump" in
major|minor|patch) ;;
*)
echo "Unsupported version bump '$version_bump'."
echo "Unsupported version bump '$version_bump'." >&2
exit 1
;;
esac

git fetch --tags

latest_tag=$(git tag --list 'v*' --sort=-v:refname | head -n1)
latest_tag=$(git tag --list 'v[0-9]*.[0-9]*.[0-9]*' | sort -V | tail -n1)
if [ -z "$latest_tag" ]; then
latest_tag="v0.0.0"
fi
Expand Down
Loading