mirror of
https://github.com/actions/runner-images.git
synced 2025-12-25 02:47:41 +08:00
dd518dff50
* Resolve possible conflicts in software update PR * Push updated release branch to repo * Setup committer's name and email * Minor fix * Add step to create branch for PR * Add pause before merging * Minor renaming * Add step to delete docs branch
46 lines
1.4 KiB
YAML
46 lines
1.4 KiB
YAML
name: Merge pull request
|
|
|
|
on:
|
|
repository_dispatch:
|
|
types: [merge-pr]
|
|
|
|
|
|
jobs:
|
|
build:
|
|
runs-on: ubuntu-latest
|
|
|
|
steps:
|
|
- uses: actions/checkout@v2
|
|
with:
|
|
fetch-depth: 0
|
|
|
|
- name: Resolve possible conflicts ${{ github.event.client_payload.ReleaseBranchName }} with main
|
|
run: |
|
|
git config --global user.email "no-reply@github.com"
|
|
git config --global user.name "Actions service account"
|
|
git checkout ${{ github.event.client_payload.ReleaseBranchName }}-docs
|
|
git merge --no-edit --strategy-option=ours main
|
|
git push origin ${{ github.event.client_payload.ReleaseBranchName }}-docs
|
|
sleep 30
|
|
|
|
- name: Merge pull request for ${{ github.event.client_payload.ReleaseBranchName }}
|
|
uses: actions/github-script@v2
|
|
with:
|
|
github-token: ${{secrets.GITHUB_TOKEN}}
|
|
script: |
|
|
github.pulls.merge({
|
|
owner: context.repo.owner,
|
|
repo: context.repo.repo,
|
|
pull_number: ${{ github.event.client_payload.PullRequestNumber }}
|
|
})
|
|
|
|
- name: Delete docs branch ${{ github.event.client_payload.ReleaseBranchName }}-docs
|
|
uses: actions/github-script@v2
|
|
with:
|
|
github-token: ${{secrets.GITHUB_TOKEN}}
|
|
script: |
|
|
github.git.deleteRef({
|
|
owner: context.repo.owner,
|
|
repo: context.repo.repo,
|
|
ref: "heads/${{ github.event.client_payload.ReleaseBranchName }}-docs"
|
|
}) |