From: Don Zickus <dzickus@xxxxxxxxxx>
Today ark-latest is built by starting with ark-patches, merging
os-build and applying 'extra' patches from gitlab, and finally
tagged.
In preparation for a single tree workflow where ark-patches disappears,
lets swap the process to make it easier for ark-patches to be
removed.
Instead let's build ark-latest by starting with os-build, merge
ark-patches, apply 'extra' patches and tag it.
Later, it becomes easy to drop the ark-patches merge and when no
'extra' patches exist, ark-latest and os-build are identical.
However, this leads to a changelog quirk. The genspec logic
thinks all the ark-patches are new additions and adds entries
for that whole branch into the changelog because the MARKER has
not changed.
This is noise. For now I created a temporary hack to work around
this until a single workflow is implemented and the problem naturally
goes away.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
---
redhat/genspec.sh | 8 ++++++++
redhat/scripts/ci/ark-create-release.sh | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index b72dffe14729..fbe275f6f4e7 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -195,6 +195,14 @@ if [ "$MARKER" != "$LAST_MARKER" ]; then
rm $clogf.tmp $clogf.unique
fi
+# HACK temporary hack until single tree workflow
+# Don't reprint all the ark-patches again.
+if [ -n "$(git log --oneline --first-parent --grep="Merge ark patches" ${lasttag}..)" ]; then
+ # Throw away the clogf and just print the summary merge
+ echo "" > $clogf
+ echo "- Merge ark-patches" >> $clogf
+fi
+
LENGTH=$(wc -l $clogf | awk '{print $1}')
#the changelog was created in reverse order
diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh
index 3181f32a56e8..0d4cfd9181e5 100755
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -43,10 +43,10 @@ if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
RELEASE_BRANCHES=" ark/$UPSTREAM_REF ark/patches/$UPSTREAM_REF"
else
# This is a snapshot release so we're only going to make a tag
- git checkout --detach ark-patches && git describe
+ git checkout --detach os-build && git describe
RELEASE_BRANCHES=""
fi
-git merge -m "Merge configuration and build scripts" os-build
+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 | \
--
GitLab
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
