Skip to content

Commit

Permalink
Update v9 compliance action
Browse files Browse the repository at this point in the history
put the cherry-pick tests into an extra script and
provide a skip list of commits for manual checking
if needed
  • Loading branch information
schaefi committed Feb 29, 2024
1 parent 11eebcb commit 65ff9ab
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ci-kiwi-9-compliant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
19 changes: 19 additions & 0 deletions helper/v9compliance_test.sh
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

0 comments on commit 65ff9ab

Please sign in to comment.