davidlt
/
kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop merging ark-patches for release 

With the new single workflow, ark-patches is rolled into the os-build
branch.  There is no more need to merge the external branch.

Signed-off-by: Don Zickus <dzickus@redhat.com>
This commit is contained in:
Don Zickus 2020-09-25 19:24:31 -04:00 committed by Justin M. Forbes
parent 68adac2f62
commit 2aab4e8edf
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redhat/scripts/ci/ark-create-release.sh
View File

@ -43,8 +43,6 @@ else
git checkout --detach os-build && git describe
RELEASE_BRANCHES=""
fi
git merge -m "Merge ark patches" ark-patches
MR_PATCHES=$(gitlab project-merge-request list --project-id=${PROJECT_ID} \
--labels="Include in Releases" --state=opened | grep -v "^$" | sort | \
awk '{ print "https://gitlab.com/cki-project/kernel-ark/-/merge_requests/" $2 ".patch" }')