[OS-BUILD PATCH] Create ark-latest branch last for CI scripts

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

 



From: Don Zickus <dzickus@xxxxxxxxxx>

Create ark-latest branch last for CI scripts

It was noticed with the change to use ark-infra, the CI scripts were
failing at 'git push gitlab $(git describe).

That command was supposed to push a newly created tag from 'make
dist-release-tag' which is pointed to by ark-latest.

A 'git describe' of ark-latest translates to that tag and is easily
pushed.  With the addition of 'ark-infra', the last branch checked out
is ark-infra.  A 'git describe' of that branch translates into an
un-tagged reference forcing the 'git push' script to fail.

Fix this by forcing the ark-latest branch to be checked last so that
'git describe' works correctly.

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

diff a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,9 @@ rawhide_release:
           -o merge_request.remove_source_branch \
           gitlab "$branch"
       done;
+    # ark-create-release.sh creates a tag for ark-latest to be pushed.
+    # Make sure the ark-latest branch is checked out.
+    - git checkout ark-latest
     - git push gitlab "$(git describe)"
     - git push gitlab ark/*
     - git push -f gitlab ark-latest

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1043
_______________________________________________
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 on the list, report it: https://pagure.io/fedora-infrastructure




[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