From 482651582ded5845dfc341dbec25fd3138caee41 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 30 Mar 2022 18:07:06 +0200 Subject: [PATCH] .github: Checkout our base branch in SDK coreos-overlay too --- .../src/third_party/coreos-overlay/.github/workflows/common.sh | 1 + 1 file changed, 1 insertion(+) 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 5dc71e3438..45d534f16a 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 @@ -44,6 +44,7 @@ function prepare_git_repo() { # setup overlay repo inside SDK too (be fork friendly) git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" remote add our_remote "${our_remote_url}" git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" fetch our_remote + git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" checkout -B "${BASE_BRANCH}" "our_remote/${BASE_BRANCH}" } # caller needs to set pass a parameter as a branch name to be created.