-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
put the cherry-pick tests into an extra script and provide a skip list of commits for manual checking if needed
- Loading branch information
Showing
2 changed files
with
20 additions
and
1 deletion.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,4 +12,4 @@ jobs: | |
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Run rebase | ||
run: git fetch --all; git config user.email [email protected]; git config user.name git_action; git checkout master; git log --pretty=oneline --no-merges "origin/master..origin/${GITHUB_HEAD_REF}" | cut -f1 -d " " | head -n -1 > commit.list; git cherry-pick --keep-redundant-commits $(tac commit.list | tr "\n" " ") | ||
run: helper/v9compliance_test.sh "${GITHUB_HEAD_REF}" |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#!/bin/bash | ||
|
||
GITHUB_HEAD_REF=$1 | ||
|
||
git fetch --all | ||
git config user.email [email protected] | ||
git config user.name git_action | ||
git checkout master | ||
git log \ | ||
--pretty=oneline \ | ||
--no-merges origin/master..origin/"${GITHUB_HEAD_REF}" |\ | ||
cut -f1 -d " " | head -n -1 > commit.list | ||
|
||
for i in $(tac commit.list);do | ||
git cherry-pick --keep-redundant-commits "$i" 2>/dev/null || ( | ||
echo "****** SKIPPED: $i ******" | ||
git cherry-pick --skip | ||
) | ||
done |