mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2186 from flatcar/krnowak/revert-old-lts-workarounds

Browse Source 
.github: Revert old lts workarounds
This commit is contained in:
Krzesimir Nowak 2022-09-26 15:07:48 +02:00 committed by GitHub
commit 204a54bb76
12 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

1
sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-releases-lts-2021.yml vendored
View File

@ -30,7 +30,6 @@ jobs:
BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAINTENANCE }} BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAINTENANCE }}
PATH: ${{ steps.setup-flatcar-sdk.outputs.path }} PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAINTENANCE }} VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAINTENANCE }}
CHECKOUT_SCRIPTS: "false"
PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }} PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }}
SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }} SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }}
run: .github/workflows/cacerts-apply-patch.sh run: .github/workflows/cacerts-apply-patch.sh

10
sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh vendored
View File

@ -54,16 +54,12 @@ function prepare_git_repo() {
# caller needs to set pass a parameter as a branch name to be created. # caller needs to set pass a parameter as a branch name to be created.
function checkout_branches() { function checkout_branches() {
TARGET_BRANCH=$1 TARGET_BRANCH=$1
CHECKOUT_SCRIPTS=$2
[[ -z "${TARGET_BRANCH}" ]] && echo "No target branch specified. exit." && return 1 [[ -z "${TARGET_BRANCH}" ]] && echo "No target branch specified. exit." && return 1
# Check out the scripts repo only if CHECKOUT_SCRIPTS == true, due to # Check out the scripts.
# a corner case of its LTS-2021 branch does not have run_sdk_container. git -C "${SDK_OUTER_TOPSCRIPTSDIR}" checkout -B "${BASE_BRANCH}" \
if [[ "${CHECKOUT_SCRIPTS}" = true ]]; then "origin/${BASE_BRANCH}"
git -C "${SDK_OUTER_TOPSCRIPTSDIR}" checkout -B "${BASE_BRANCH}" \
"origin/${BASE_BRANCH}"
fi
# update submodules like portage-stable under the scripts directories # update submodules like portage-stable under the scripts directories
git submodule update --init --recursive git submodule update --init --recursive

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "containerd-${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "docker-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "docker-${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

4
sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh vendored
View File

@ -19,15 +19,13 @@ for version_new in ${VERSIONS_NEW}; do
VERSIONS["${version_new_trimmed}"]="${version_new}" VERSIONS["${version_new_trimmed}"]="${version_new}"
done done
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
branch_name="go-$(join_by '-and-' ${VERSIONS_NEW})-${TARGET}" 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 exit 0
fi fi

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh vendored
View File

@ -5,13 +5,12 @@ set -euo pipefail
# trim the 3rd part in the input semver, e.g. from 5.4.1 to 5.4 # trim the 3rd part in the input semver, e.g. from 5.4.1 to 5.4
VERSION_SHORT=${VERSION_NEW%.*} VERSION_SHORT=${VERSION_NEW%.*}
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "linux-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "linux-${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

1
sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-lts-2021.yml vendored
View File

@ -33,7 +33,6 @@ jobs:
BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAINTENANCE }} BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAINTENANCE }}
PATH: ${{ steps.setup-flatcar-sdk.outputs.path }} PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAINTENANCE }} VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAINTENANCE }}
CHECKOUT_SCRIPTS: "false"
PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }} PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }}
SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }} SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }}
run: .github/workflows/kernel-apply-patch.sh run: .github/workflows/kernel-apply-patch.sh

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "runc-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "runc-${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "rust-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "rust-${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh vendored
View File

@ -3,13 +3,12 @@
set -euo pipefail set -euo pipefail
UPDATE_NEEDED=1 UPDATE_NEEDED=1
CHECKOUT_SCRIPTS="${CHECKOUT_SCRIPTS:-true}"
. .github/workflows/common.sh . .github/workflows/common.sh
prepare_git_repo prepare_git_repo
if ! checkout_branches "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then
UPDATE_NEEDED=0 UPDATE_NEEDED=0
exit 0 exit 0
fi fi