From 17ee68c0ef726aa49a27985e2b9ee148c392bfe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Fri, 12 Jan 2024 19:49:36 +0100 Subject: [PATCH] drop unneeded commit from cherry-pick for v9 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 --- .github/workflows/ci-kiwi-9-compliant.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-kiwi-9-compliant.yml b/.github/workflows/ci-kiwi-9-compliant.yml index 1adde26911a..5a738c3cc9b 100644 --- a/.github/workflows/ci-kiwi-9-compliant.yml +++ b/.github/workflows/ci-kiwi-9-compliant.yml @@ -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 b129bbe9099f66cf33ca1544a7ea539b10bf65df > commit.list; git cherry-pick $(tac commit.list | tr "\n" " ")