diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-apply-patch.sh index 19515ff5dd..d74de66f6c 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-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 "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then +if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then UPDATE_NEEDED=0 exit 0 fi diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-releases-lts-2021.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-releases-lts-2021.yml index 443d204cae..c64aea3750 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-releases-lts-2021.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/cacerts-releases-lts-2021.yml @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh index 363c650e3a..55126f9b9c 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.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 diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh index fa4285b55d..eafdf2ac38 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-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 "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then +if ! checkout_branches "containerd-${VERSION_NEW}-${TARGET}"; then UPDATE_NEEDED=0 exit 0 fi diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh index 75f89b6192..2e953f33f9 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-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 "docker-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then +if ! checkout_branches "docker-${VERSION_NEW}-${TARGET}"; then UPDATE_NEEDED=0 exit 0 fi diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh index d8d8ea761b..430ceec9ba 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-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 "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then +if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then UPDATE_NEEDED=0 exit 0 fi diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh index fa3b8ce394..ac8734f380 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh index 1dc1dd35c7..9846ccc5f8 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-lts-2021.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-lts-2021.yml index 0ebc33ccda..184e6c3931 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-lts-2021.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-lts-2021.yml @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh index 8e61e0b073..0efc7abd11 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-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 diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh index 3cd5c50a0a..c09ced47ac 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-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 "rust-${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then +if ! checkout_branches "rust-${VERSION_NEW}-${TARGET}"; then UPDATE_NEEDED=0 exit 0 fi diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh index 898132ff93..20f61d5468 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-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 "${VERSION_NEW}-${TARGET}" "${CHECKOUT_SCRIPTS}"; then +if ! checkout_branches "${VERSION_NEW}-${TARGET}"; then UPDATE_NEEDED=0 exit 0 fi