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
14 changes: 12 additions & 2 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,21 @@ jobs:

- name: Normalize release PR pyproject prerelease version
if: ${{ steps.release.outputs.prs_created == 'true' }}
env:
RELEASE_PR_BRANCH: release-please--branches--${{ github.ref_name }}
run: |
set -euo pipefail

BASE_RELEASE_PR_BRANCH="release-please--branches--${{ github.ref_name }}"
COMPONENT_RELEASE_PR_BRANCH="${BASE_RELEASE_PR_BRANCH}--components--adcp"

if git ls-remote --exit-code --heads origin "${COMPONENT_RELEASE_PR_BRANCH}" >/dev/null 2>&1; then
RELEASE_PR_BRANCH="${COMPONENT_RELEASE_PR_BRANCH}"
elif git ls-remote --exit-code --heads origin "${BASE_RELEASE_PR_BRANCH}" >/dev/null 2>&1; then
RELEASE_PR_BRANCH="${BASE_RELEASE_PR_BRANCH}"
else
echo "No release PR branch found to normalize"
exit 0
fi

git fetch origin "${RELEASE_PR_BRANCH}:${RELEASE_PR_BRANCH}"
git switch "${RELEASE_PR_BRANCH}"

Expand Down
1 change: 1 addition & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"changelog-path": "CHANGELOG.md",
"bump-minor-pre-major": true,
"bump-patch-for-minor-pre-major": false,
"include-component-in-tag": false,
"versioning": "prerelease",
"prerelease": true,
"prerelease-type": "beta"
Expand Down
Loading