Auto merge PRs to branch-24.10 from branch-24.08 [skip ci] #257
Workflow file for this run
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) 2022-2024, NVIDIA CORPORATION. | |
| # | |
| # 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 | |
| # | |
| # http://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. | |
| # A workflow to keep BASE branch up-to-date from HEAD branch | |
| name: auto-merge HEAD to BASE | |
| on: | |
| pull_request_target: | |
| branches: | |
| - branch-24.08 | |
| types: [closed] | |
| env: | |
| HEAD: branch-24.08 | |
| BASE: branch-24.10 | |
| jobs: | |
| auto-merge: | |
| if: github.event.pull_request.merged == true | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v4 | |
| with: | |
| ref: ${{ env.HEAD }} # force to fetch from latest upstream instead of PR ref | |
| token: ${{ secrets.AUTOMERGE_TOKEN }} # workaround auto-merge token to avoid GITHUB_TOKEN insufficient permission | |
| - name: push intermediate branch for auto-merge | |
| run: | | |
| git config user.name "spark-rapids automation" | |
| git config user.email "[email protected] " | |
| git fetch origin ${HEAD} ${BASE} | |
| git checkout -b ${INTERMEDIATE_HEAD} origin/${HEAD} | |
| # Sync the $BASE branch with the commits from the $HEAD branch, | |
| # excluding the paths defined as $FILE_USE_BASE (located under ./thirdparty). | |
| git checkout origin/${BASE} -- ${FILE_USE_BASE} | |
| # If any submodule file is updated in the HEAD branch, | |
| # always change it to the corresponding one from the BASE branch. | |
| [ ! -z "$(git status --porcelain=v1 --untracked=no)" ] && \ | |
| git commit -s -am "Auto-merge use ${BASE} versions" | |
| git push origin ${INTERMEDIATE_HEAD} -f | |
| env: | |
| INTERMEDIATE_HEAD: bot-auto-merge-${{ env.HEAD }} | |
| FILE_USE_BASE: thirdparty/cudf thirdparty/cudf-pins | |
| - name: auto-merge job | |
| uses: ./.github/workflows/action-helper | |
| with: | |
| operator: auto-merge | |
| env: | |
| OWNER: NVIDIA | |
| REPO: spark-rapids-jni | |
| HEAD: bot-auto-merge-${{ env.HEAD }} | |
| BASE: ${{ env.BASE }} | |
| TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} | |