Skip to content

Commit

Permalink
Allow empty cherry-picks for compliance test
Browse files Browse the repository at this point in the history
If we cherry-pick from main to master the compliance check
will notice that a commit already exists. This is not an error
and we can allow to continue the picking via --allow-empty
  • Loading branch information
schaefi committed Feb 19, 2024
1 parent 4dcc0db commit ea568f9
Showing 1 changed file with 1 addition 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 $(tac commit.list | tr "\n" " ")
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" " ")

0 comments on commit ea568f9

Please sign in to comment.