Skip to content

Commit

Permalink
drop unneeded commit from cherry-pick for v9
Browse files Browse the repository at this point in the history
The drop of py3_9 from the workflow is a commit that
conflicts in the kiwi v9.x.x code stream but is also
not important for the backport
  • Loading branch information
schaefi committed Jan 12, 2024
1 parent f2c5fde commit 95b80be
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 @@ -11,4 +11,4 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run rebase
run: git fetch --all; git config user.email cherrypick@action.com; 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 cherrypick@action.com; 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 | grep -v ec01a903a0cfa5cacc41749fbe755e772f0588b3 > commit.list; git cherry-pick $(tac commit.list | tr "\n" " ")

0 comments on commit 95b80be

Please sign in to comment.