mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci-automation: SDK build updates version.txt in main branch

Browse Source 
This change has sdk_bootstrap update the origin branch when run from the
main branch, updating the SDK and OS version in 'main' for each SDK
bootstrap build.

Release / maintenance branches have the SDK version set in the
versionfile at release time. But main is never updated.

Updating the versionfile in main when a new SDK is built ensures that
dev branches based on main will also use the correct SDK version (e.g.
in subsequent CI builds).
This commit is contained in:
Thilo Fromm 2022-02-23 20:41:57 +01:00 committed by Kai Lueke
parent 75b7fd1038
commit c1f4dcc4a4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci-automation/ci_automation_common.sh
View File

@ -49,6 +49,7 @@ function update_submodules() {
function update_and_push_version() {
local version="$1"
local push_to_branch="${2:-false}"
# set up author and email so git does not complain when tagging
if ! git config --get user.name >/dev/null 2>&1 ; then
@ -72,8 +73,9 @@ function update_and_push_version() {
git tag -f "${TAG_ARGS[@]}" "${version}"
if [ "${PUSH-0}" = 1 ]; then
git push
if [ "${push_to_branch}" = "true" ]; then
local branch="$(git rev-parse --abbrev-ref HEAD)"
git push origin "${branch}"
fi
if git push origin "${version}" ; then

10
ci-automation/sdk_bootstrap.sh
View File

@ -84,7 +84,13 @@ function sdk_bootstrap() {
copy_to_buildcache "sdk/${ARCH}/${vernum}" "${dest_tarball}"*
cd -
# Create new tag in scripts repo w/ updated versionfile + submodules
update_and_push_version "sdk-${git_vernum}"
# Create new tag in scripts repo w/ updated versionfile + submodules.
# When on the 'main' branch then also push to the branch so the versionfile
# and git submodules stay up to date.
local push_branch="false"
if [ "$(git rev-parse --abbrev-ref HEAD)" = "main" ] ; then
push_branch="true"
fi
update_and_push_version "sdk-${git_vernum}" "${push_branch}"
}
# --