From 3aa0fe280ff822c0df8ff0fc95399bce5282856c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 20 Nov 2026 10:12:04 +0000 Subject: [PATCH] .github: Always use the SDK from version.txt for main I recently added an override for this, but it's annoying when main is broken for long periods, so always use version.txt in that case. I've kept the override in case we need it for the other channels at some point. Signed-off-by: James Le Cuirot --- .github/workflows/setup-flatcar-sdk.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/setup-flatcar-sdk.sh b/.github/workflows/setup-flatcar-sdk.sh index 67995afabcb..d4776bff6dc 100755 --- a/.github/workflows/setup-flatcar-sdk.sh +++ b/.github/workflows/setup-flatcar-sdk.sh @@ -35,12 +35,9 @@ fi arch="amd64" sdk_name="flatcar-sdk-${arch}" -if [[ ${USE_REPO_SDK_VERSION:-false} = true ]]; then +if [[ -z ${MIRROR_LINK:-} || ${USE_REPO_SDK_VERSION:-false} = true ]]; then docker_sdk_vernum="${FLATCAR_SDK_VERSION}" else - # for main channel, pull in alpha SDK - [[ ${CHANNEL} = main ]] && MIRROR_LINK='https://alpha.release.flatcar-linux.net/amd64-usr/current' - # Pin the docker image version to that of the latest release in the channel. docker_sdk_vernum="$(curl -s -S -f -L "${MIRROR_LINK}/version.txt" | grep -m 1 FLATCAR_SDK_VERSION=)" docker_sdk_vernum="${docker_sdk_vernum#*=}"