diff --git a/scripts/build-release.sh b/scripts/build-release.sh index 524af0078a7..e90fb3e138f 100755 --- a/scripts/build-release.sh +++ b/scripts/build-release.sh @@ -26,6 +26,6 @@ pushd "${ETCD_ROOT}" >/dev/null for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do log_callout "Building ${TARGET_ARCH} docker image..." - GOOS=linux GOARCH=${TARGET_ARCH} BINARYDIR=release/etcd-${VERSION}-linux-${TARGET_ARCH} BUILDDIR=release ./scripts/build-docker "${VERSION}" + GOOS=linux GOARCH=${TARGET_ARCH} BINARYDIR=release/etcd-${VERSION}-linux-${TARGET_ARCH} BUILDDIR=release ./scripts/build-docker.sh "${VERSION}" done popd >/dev/null diff --git a/scripts/release.sh b/scripts/release.sh index 9fdd5d68960..ec41510ce0c 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -102,7 +102,7 @@ main() { # Check go version. local go_version current_go_version - go_version="go$(run_go_tool "github.com/mikefarah/yq/v3" read .travis.yml "go[0]")" + go_version="go$(run_go_tool "github.com/mikefarah/yq/v3" read .github/workflows/build.yaml "jobs.build.steps[1].with.go-version")" current_go_version=$(go version | awk '{ print $3 }') if [[ "${current_go_version}" != "${go_version}" ]]; then log_error "Current go version is ${current_go_version}, but etcd ${RELEASE_VERSION} requires ${go_version} (see .travis.yml)." @@ -129,7 +129,7 @@ main() { log_callout "Building etcd and checking --version output" - run ./build.sh + run ./scripts/build.sh local etcd_version etcd_version=$(bin/etcd --version | grep "etcd Version" | awk '{ print $3 }') if [[ "${etcd_version}" != "${VERSION}" ]]; then