From: Don Zickus <dzickus@xxxxxxxxxx> Now that the merge-upstream stage is separated and working, let's remove it from the release stage. These scripts are already excuted by the 'merge-upstream' stage. This changes just removes the duplication. Trivial change. Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx> --- redhat/scripts/ci/ark-create-release.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh index 0d4cfd9181e5..aeb3696f5caf 100755 --- a/redhat/scripts/ci/ark-create-release.sh +++ b/redhat/scripts/ci/ark-create-release.sh @@ -33,9 +33,6 @@ if [ -n "$BASE_RELEASE" ]; then fi git checkout os-build -./redhat/scripts/ci/ark-rebase-patches.sh "$UPSTREAM_REF" "$PROJECT_ID" -git checkout os-build -./redhat/scripts/ci/ark-update-configs.sh "$UPSTREAM_REF" "$PROJECT_ID" make dist-release if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then -- 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
