From: Don Zickus <dzickus@xxxxxxxxxx> As part of splitting the merge-upstream and release stages apart, the merge upstream wasn't working quite right. These are cleanup fixes to fix that. The main change is to drop the ark rebase patches script. Running that through a Makefile through gitlab CI creates a funky environment where the next script (update-configs.sh) no longer exists because of the git checkout changes. Keep rebase-patches in the gitlab-ci script for now. That will be removed soon enough. No effect on normal workflow. The other fixes are self-explanatory. Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx> --- redhat/Makefile | 5 ++--- redhat/scripts/ci/ark-rebase-patches.sh | 4 ++-- redhat/scripts/ci/ark-update-configs.sh | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/redhat/Makefile b/redhat/Makefile index bfc9cd63df60..27d2cd94e78f 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -327,11 +327,10 @@ dist-merge-upstream: git-tree-check fi; @# If TAG is empty, script defaults to master:HEAD - @$(REDHAT)/scripts/ci/ark-rebase-patches.sh $(TAG) || exit 1 git checkout $(DIST_BRANCH) @$(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG) -dist-merge-upstream-push: DIST_PUSH="1" +dist-merge-upstream-push: export DIST_PUSH="1" dist-merge-upstream-push: dist-merge-upstream dist-fedora-release: git-tree-check @@ -340,7 +339,7 @@ dist-fedora-release: git-tree-check @cd ..; $(REDHAT)/scripts/ci/ark-create-release.sh $(TAG) || \ (echo "Unable to create release tag"; exit 1) -dist-fedora-release-push: DIST_PUSH="1" +dist-fedora-release-push: export DIST_PUSH="1" dist-fedora-release-push: dist-fedora-release .PHONY: dist-brew dist-koji diff --git a/redhat/scripts/ci/ark-rebase-patches.sh b/redhat/scripts/ci/ark-rebase-patches.sh index ef2183ecc799..2e64b90ac277 100755 --- a/redhat/scripts/ci/ark-rebase-patches.sh +++ b/redhat/scripts/ci/ark-rebase-patches.sh @@ -99,7 +99,7 @@ fi if $CLEAN_REBASE; then if test -n "$DIST_PUSH"; then - echo "Pushing branch ark-patches to $(get remote get-url gitlab)" + echo "Pushing branch ark-patches to $(git remote get-url gitlab)" git push -f gitlab ark-patches else printf "You can safely update ark-patches with 'git push -f <remote> ark-patches'\n" @@ -114,7 +114,7 @@ if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then printf "Creating branch \"ark/patches/%s\"\n" "$UPSTREAM_REF" git branch ark/patches/"$UPSTREAM_REF" if test -n "$DIST_PUSH"; then - echo "Pushing branch ark/patches to $(get remote get-url gitlab)" + echo "Pushing branch ark/patches to $(git remote get-url gitlab)" git push gitlab ark/patches/"$UPSTREAM_REF" else printf "Don't forget to run 'git push <remote> ark/patches/%s'\n" "$UPSTREAM_REF" diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh index 22dcead23f88..e8baacdb929e 100755 --- a/redhat/scripts/ci/ark-update-configs.sh +++ b/redhat/scripts/ci/ark-update-configs.sh @@ -67,7 +67,7 @@ else fi if test -n "$DIST_PUSH"; then - echo "Pushing branch $(git branch --show-current) to $(get remote get-url gitlab)" + echo "Pushing branch $(git branch --show-current) to $(git remote get-url gitlab)" git push gitlab HEAD echo "Pushing config update branches" -- 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
