[OS-BUILD PATCHv2 2/9] CI: Remove stale TAG and Makefile cruft

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Don Zickus <dzickus@xxxxxxxxxx>

CI: Remove stale TAG and Makefile cruft

The TAG variable turned into _TAG but the ci scripts were never updated
to reflect that.  No one noticed for over a year, therefore it must not
be important.

Also dist-merge-upstream had a branch check as a safety valve to prevent
accidentally losing changes to testing by switching branches.  Later a
'git-tree-check' was added to prevent the script from running on a dirty
tree.  The latter is more useful than the former.  Remove the former.

Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -797,22 +797,14 @@ git-tree-check:
 		{ echo -e "Dirty tree, please clean before merging.\n"; exit 1; }
 
 dist-merge-upstream: git-tree-check
-	@if test "$(shell $(GIT) branch --show-current)" != "$(DIST_BRANCH)"; then \
-		echo -e "Please checkout $(DIST_BRANCH) branch before merging.\n"; \
-		exit 1; \
-		fi;
-
-	@# If TAG is empty, script defaults to master:HEAD
-	@$(GIT) checkout $(DIST_BRANCH)
-	@cd ..; $(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
+	@cd ..; $(REDHAT)/scripts/ci/ark-update-configs.sh
 
 dist-merge-upstream-push: export DIST_PUSH="1"
 dist-merge-upstream-push: dist-merge-upstream
 
 dist-fedora-release: git-tree-check
 
-	@# If TAG is empty, script defaults to master:HEAD
-	@cd ..; $(REDHAT)/scripts/ci/ark-create-release.sh $(TAG) || \
+	@cd ..; $(REDHAT)/scripts/ci/ark-create-release.sh || \
 		(echo "Unable to create release tag"; exit 1)
 
 dist-fedora-release-push: export DIST_PUSH="1"

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2518
_______________________________________________
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
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux