mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 17:06:58 +02:00
Merge pull request #2186 from flatcar/krnowak/revert-old-lts-workarounds
.github: Revert old lts workarounds
This commit is contained in:
commit
204a54bb76
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -30,7 +30,6 @@ jobs:
|
||||
BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAINTENANCE }}
|
||||
PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
|
||||
VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAINTENANCE }}
|
||||
CHECKOUT_SCRIPTS: "false"
|
||||
PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }}
|
||||
SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }}
|
||||
run: .github/workflows/cacerts-apply-patch.sh
|
||||
|
@ -54,16 +54,12 @@ function prepare_git_repo() {
|
||||
# caller needs to set pass a parameter as a branch name to be created.
|
||||
function checkout_branches() {
|
||||
TARGET_BRANCH=$1
|
||||
CHECKOUT_SCRIPTS=$2
|
||||
|
||||
[[ -z "${TARGET_BRANCH}" ]] && echo "No target branch specified. exit." && return 1
|
||||
|
||||
# Check out the scripts repo only if CHECKOUT_SCRIPTS == true, due to
|
||||
# a corner case of its LTS-2021 branch does not have run_sdk_container.
|
||||
if [[ "${CHECKOUT_SCRIPTS}" = true ]]; then
|
||||
git -C "${SDK_OUTER_TOPSCRIPTSDIR}" checkout -B "${BASE_BRANCH}" \
|
||||
"origin/${BASE_BRANCH}"
|
||||
fi
|
||||
# Check out the scripts.
|
||||
git -C "${SDK_OUTER_TOPSCRIPTSDIR}" checkout -B "${BASE_BRANCH}" \
|
||||
"origin/${BASE_BRANCH}"
|
||||
|
||||
# update submodules like portage-stable under the scripts directories
|
||||
git submodule update --init --recursive
|
||||
|
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "containerd-${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "docker-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "docker-${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -19,15 +19,13 @@ for version_new in ${VERSIONS_NEW}; do
|
||||
VERSIONS["${version_new_trimmed}"]="${version_new}"
|
||||
done
|
||||
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
branch_name="go-$(join_by '-and-' ${VERSIONS_NEW})-${TARGET}"
|
||||
|
||||
if ! checkout_branches "${branch_name}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "${branch_name}"; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
@ -5,13 +5,12 @@ set -euo pipefail
|
||||
# trim the 3rd part in the input semver, e.g. from 5.4.1 to 5.4
|
||||
VERSION_SHORT=${VERSION_NEW%.*}
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "linux-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "linux-${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -33,7 +33,6 @@ jobs:
|
||||
BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAINTENANCE }}
|
||||
PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
|
||||
VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAINTENANCE }}
|
||||
CHECKOUT_SCRIPTS: "false"
|
||||
PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }}
|
||||
SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }}
|
||||
run: .github/workflows/kernel-apply-patch.sh
|
||||
|
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "runc-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "runc-${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "rust-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "rust-${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
@ -3,13 +3,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
UPDATE_NEEDED=1
|
||||
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
|
||||
|
||||
. .github/workflows/common.sh
|
||||
|
||||
prepare_git_repo
|
||||
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then
|
||||
if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then
|
||||
UPDATE_NEEDED=0
|
||||
exit 0
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user