mirror of
https://github.com/flatcar/scripts.git
synced 2026-02-19 06:32:25 +01:00
sdk_bootstrap: Push a branch also for two-phase SDK nightly builds
The two-phase nightly builds create an intermediate tag first, which didn't match the main nightly tag regexp before. Because of that, the commit was not pushed to the main branch. The following final SDK build had a version that matched the regexp, but the last commit (with the intermediate tag on it) wasn't in main, and thus was also not pushed.
This commit is contained in:
parent
deed27f38a
commit
a6f50b3099
@ -76,9 +76,10 @@ function _sdk_bootstrap_impl() {
|
||||
|
||||
# Create new tag in scripts repo w/ updated versionfile.
|
||||
# Also push the changes to the branch ONLY IF we're doing a nightly
|
||||
# build of the 'main' branch AND we're definitely ON the main branch
|
||||
# build of the 'main' branch AND we're definitely ON the main branch.
|
||||
# This includes intermediate SDKs when doing 2-phase nightly builds.
|
||||
local push_branch="false"
|
||||
if [[ "${version}" =~ ^main-[0-9.]+-nightly-[-0-9]+$ ]] \
|
||||
if [[ "${version}" =~ ^main-[0-9.]+-nightly-[-0-9]+(-INTERMEDIATE)?$ ]] \
|
||||
&& [ "$(git rev-parse --abbrev-ref HEAD)" = "main" ] ; then
|
||||
push_branch="true"
|
||||
local existing_tag=""
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user