Skip to content

Commit

Permalink
Add comments to show what we want to do here
Browse files Browse the repository at this point in the history
We want to merge all spark-rapids-jni HEAD(24.04) commit to BASE(24.06), 

But we do not want to merge submodules(24.04 cudf cudf-pin) to BASE(24.06)

As we need pin cudf/cudf-pin submodules to 24.06 instead of 24.04
  • Loading branch information
NvTimLiu authored Apr 10, 2024
1 parent 24ef044 commit 22314bc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ jobs:
git config user.email "[email protected] "
git fetch origin ${HEAD} ${BASE}
git checkout -b ${INTERMEDIATE_HEAD} origin/${HEAD}
# Use commits from HEAD, but keek submodule files(FILE_USE_BASE) from BASE
git checkout origin/${BASE} -- ${FILE_USE_BASE}
# If any submodule file is updaged from HEAD, always change to BASE ones
[ ! -z "$(git status --porcelain=v1 --untracked=no)" ] && \
git commit -s -am "Auto-merge use ${BASE} versions"
git push origin ${INTERMEDIATE_HEAD} -f
Expand Down

0 comments on commit 22314bc

Please sign in to comment.