Skip to content

Merge main into release/6.2 #9

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 1 commit into
base: release/6.2
Choose a base branch
from
Open

Merge main into release/6.2 #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 7 additions & 40 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,43 +11,10 @@ on:
jobs:
create_merge_pr:
name: Create PR to merge main into release branch
runs-on: ubuntu-latest
if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-format') || (github.event_name != 'schedule') # Ensure that we don't run this on a schedule in a fork
steps:
- name: Set up variables
id: variables
run: |
echo "release_branch=release/6.2" >> "$GITHUB_OUTPUT"
echo "pr_branch=automerge/merge-main-$(date +%Y-%m-%d)" >> "$GITHUB_OUTPUT"
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create merge commit
id: create_merge_commit
run: |
# Without this, we can't perform git operations in GitHub actions.
git config --global --add safe.directory "$(realpath .)"
git config --local user.name 'swift-ci'
git config --local user.email '[email protected]'

git checkout ${{ steps.variables.outputs.release_branch }}
git merge main

if [[ "$(git rev-parse HEAD)" = "$(git rev-parse main)" ]]; then
echo "has_merged_commits=true" >> "$GITHUB_OUTPUT"
else
echo "has_merged_commits=false" >> "$GITHUB_OUTPUT"
fi
- name: Push branch and create PR
id: push_branch
if: ${{ steps.create_merge_commit.outputs.has_merged_commits }}
env:
GH_TOKEN: ${{ github.token }}
run: |
git checkout -b "${{ steps.variables.outputs.pr_branch }}"
git push --set-upstream origin "${{ steps.variables.outputs.pr_branch }}"

gh pr create -B "${{ steps.variables.outputs.release_branch }}" -H "${{ steps.variables.outputs.pr_branch }}" \
--title 'Merge `main` into `${{ steps.variables.outputs.release_branch }}`' \
--body 'This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.'
uses: ahoppen/github-workflows/.github/workflows/create_automerge_pr.yml@auto-merge-write
with:
base_branch: release/6.2
permissions:
contents: write
pull-requests: write
if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-syntax') || (github.event_name != 'schedule') # Ensure that we don't run this on a schedule in a fork
Loading