这是indexloc提供的服务，不要输入任何密码
Skip to content

Open mergeback PR last #3287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Open mergeback PR last #3287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79e9b8a
Open mergeback PR last
henrymercer Nov 13, 2025
6678cee
Merge branch 'main' into henrymercer/generate-mergeback-last
henrymercer Nov 13, 2025
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
20 changes: 10 additions & 10 deletions .github/workflows/post-release-mergeback.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,6 @@ jobs:
cat $PARTIAL_CHANGELOG
echo "::endgroup::"

- name: Create mergeback branch and PR
if: ${{ steps.check.outputs.exists != 'true' && endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }}
uses: ./.github/actions/prepare-mergeback-branch
with:
base: "${{ env.BASE_BRANCH }}"
head: "${{ env.HEAD_BRANCH }}"
branch: "${{ steps.getVersion.outputs.newBranch }}"
version: "${{ steps.getVersion.outputs.version }}"
token: "${{ secrets.GITHUB_TOKEN }}"

- name: Generate token
uses: actions/create-github-app-token@v2.1.4
id: app-token
Expand All @@ -161,3 +151,13 @@ jobs:
--latest=false \
--title "$VERSION" \
--notes-file "$PARTIAL_CHANGELOG"

- name: Create mergeback branch and PR
if: ${{ endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }}
Copy link
Contributor Author

@henrymercer henrymercer Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also changed this so that we will try to open the mergeback even if the tag exists. This means we can retry generating the mergeback if this workflow fails, even if the tag is already published.

uses: ./.github/actions/prepare-mergeback-branch
with:
base: "${{ env.BASE_BRANCH }}"
head: "${{ env.HEAD_BRANCH }}"
branch: "${{ steps.getVersion.outputs.newBranch }}"
version: "${{ steps.getVersion.outputs.version }}"
token: "${{ secrets.GITHUB_TOKEN }}"
Loading