From: Don Zickus <dzickus@xxxxxxxxxx>
[CI] Make sure we are on correct branch before running script
In commit db7320bd04bf53f61a1fde45c9ef5cd2b1666d42, I tried to optimize
things by move the 'git checkout origin/os-build' to the common setup
section. The side affect of this move meant that the last git checkout
branch went from os-build to ark-infra. Therefore the
ark-create-release.sh script was always outdated.
I can fix this by reverting that change and adding the checkout os-build
line to every variant of the future cronjobs or just add it to the one
place that needs it, rawhide_release. So I am choosing to add it once.
Fixes: #123
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -264,6 +264,8 @@ rawhide_release:
script:
- git checkout --track origin/ark-latest && git describe
- git checkout --track origin/ark-infra && git describe
+ # make sure we are on correct code base before running script
+ - git checkout os-build && git describe
- redhat/scripts/ci/ark-create-release.sh || exit_code=$?
- if [ $exit_code -eq 3 ]; then echo "Tag exists, halting" && exit 0; fi;
- if [ $exit_code -ne 0 ]; then echo "Unable to create release tag" && exit 1; fi;
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2624
_______________________________________________
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
