Add workflow to check git conflict for backport PR (#2548) #238
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # | |
| # Copyright (C) 2019-2024 vdaas.org vald team <[email protected]> | |
| # | |
| # Licensed under the Apache License, Version 2.0 (the "License"); | |
| # You may not use this file except in compliance with the License. | |
| # You may obtain a copy of the License at | |
| # | |
| # https://www.apache.org/licenses/LICENSE-2.0 | |
| # | |
| # Unless required by applicable law or agreed to in writing, software | |
| # distributed under the License is distributed on an "AS IS" BASIS, | |
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| # See the License for the specific language governing permissions and | |
| # limitations under the License. | |
| # | |
| name: "Run backport PR" | |
| on: | |
| push: | |
| branches: | |
| - main | |
| - "release/v*.*" | |
| - "!release/v*.*.*" | |
| env: | |
| TARGET_LABEL_NAME_PREFIX: "actions/backport/" | |
| BACKPORT_BRANCH_NAME_PREFIX: "backport" | |
| FETCHED_GITHUB_INFO_PATH: /tmp/github_info.json | |
| GITHUB_USER: ${{ secrets.DISPATCH_USER }} | |
| GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} | |
| jobs: | |
| dump-contexts-to-log: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v4 | |
| - uses: ./.github/actions/dump-context | |
| create: | |
| runs-on: ubuntu-latest | |
| needs: [dump-contexts-to-log] | |
| steps: | |
| - uses: actions/checkout@v4 | |
| with: | |
| fetch-depth: 0 | |
| token: ${{ secrets.DISPATCH_TOKEN }} | |
| - name: Set Git config | |
| run: | | |
| git config --global --add safe.directory ${GITHUB_WORKSPACE} | |
| - uses: crazy-max/ghaction-import-gpg@v6 | |
| with: | |
| gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} | |
| git_user_signingkey: true | |
| git_commit_gpgsign: true | |
| - name: Fetch PR info | |
| run: | | |
| gh pr list --limit 10 --json number,title,body,labels,headRefName,headRefOid,mergeCommit --state merged | \ | |
| jq --arg oid "${GITHUB_SHA}" '.[] | select(.mergeCommit.oid == $oid)' > ${FETCHED_GITHUB_INFO_PATH} | |
| cat ${FETCHED_GITHUB_INFO_PATH} | |
| echo ${GITHUB_SHA} | |
| - name: Set context | |
| id: set_context | |
| run: | | |
| LABEL_NAMES=`cat ${FETCHED_GITHUB_INFO_PATH} | jq -r --arg PREFIX $TARGET_LABEL_NAME_PREFIX '[.labels[]? | select(.name | startswith($PREFIX)) | .name] | join(" ")'` | |
| echo "LABEL_NAMES=${LABEL_NAMES}" >> $GITHUB_OUTPUT # e.g.) actions/backport/v1.7 actions/backport/v1.8 | |
| echo "${LABEL_NAMES}" | |
| - name: Create PR | |
| if: ${{ steps.set_context.outputs.LABEL_NAMES != '' }} | |
| env: | |
| LABEL_NAMES: ${{ steps.set_context.outputs.LABEL_NAMES }} | |
| run: | | |
| PR_TITLE=`cat $FETCHED_GITHUB_INFO_PATH | jq -r ".title"` | |
| PR_BODY=`cat $FETCHED_GITHUB_INFO_PATH | jq -r ".body"` | |
| PR_NUM=`cat $FETCHED_GITHUB_INFO_PATH | jq -r ".number"` | |
| PR_BRANCH_NAME=`cat $FETCHED_GITHUB_INFO_PATH | jq -r ".headRefName"` | |
| echo "${PR_NUM} ${PR_TITLE}: ${PR_BODY}" | |
| for LABEL_NAME in ${LABEL_NAMES}; do | |
| BRANCH_NAME=`echo "${LABEL_NAME}" | sed -e "s:^${TARGET_LABEL_NAME_PREFIX}::"` # e.g) release/vx.x, main | |
| BACKPORT_BRANCH_NAME="${BACKPORT_BRANCH_NAME_PREFIX}/${BRANCH_NAME}/${PR_BRANCH_NAME}" # e.g) backport/release/vx.x/{current branch name} | |
| echo "BRANCH_NAME=${BRANCH_NAME}" | |
| echo "BACKPORT_BRANCH_NAME=${BACKPORT_BRANCH_NAME}" | |
| echo "SHA=${GITHUB_SHA}" | |
| git checkout ${BRANCH_NAME} | |
| git checkout -b ${BACKPORT_BRANCH_NAME} | |
| # Force cherry-pick. The conflicts will be modified within the backport PR. | |
| git cherry-pick ${GITHUB_SHA} || (git add -A && git cherry-pick --continue --no-edit) | |
| git push origin ${BACKPORT_BRANCH_NAME} | |
| gh pr create --base ${BRANCH_NAME} \ | |
| --title "Backport PR #${PR_NUM} to ${BRANCH_NAME} for ${PR_TITLE}" \ | |
| --body "${PR_BODY}" | |
| done |