|
|
|
@ -322,7 +322,7 @@ function build_consul {
|
|
|
|
|
extra_dir="${extra_dir_name}/"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local container_id=$(docker create -it -e CGO_ENABLED=0 ${image_name} gox -os="${XC_OS}" -arch="${XC_ARCH}" -osarch="!darwin/arm !darwin/arm64" -ldflags "${GOLDFLAGS}" -output "pkg/bin/${extra_dir}{{.OS}}_{{.Arch}}/consul" -tags="${GOTAGS}")
|
|
|
|
|
local container_id=$(docker create -it -e CGO_ENABLED=0 ${image_name} gox -os="${XC_OS}" -arch="${XC_ARCH}" -osarch="!darwin/arm !freebsd/arm !darwin/arm64" -ldflags "${GOLDFLAGS}" -output "pkg/bin/${extra_dir}{{.OS}}_{{.Arch}}/consul" -tags="${GOTAGS}")
|
|
|
|
|
ret=$?
|
|
|
|
|
|
|
|
|
|
if test $ret -eq 0
|
|
|
|
@ -425,7 +425,7 @@ function build_consul_local {
|
|
|
|
|
CGO_ENABLED=0 gox \
|
|
|
|
|
-os="${build_os}" \
|
|
|
|
|
-arch="${build_arch}" \
|
|
|
|
|
-osarch="!darwin/arm !darwin/arm64" \
|
|
|
|
|
-osarch="!darwin/arm !darwin/arm64 !freebsd/arm" \
|
|
|
|
|
-ldflags="${GOLDFLAGS}" \
|
|
|
|
|
-output "pkg.bin.new/${extra_dir}{{.OS}}_{{.Arch}}/consul" \
|
|
|
|
|
-tags="${GOTAGS}" \
|
|
|
|
@ -445,7 +445,7 @@ function build_consul_local {
|
|
|
|
|
do
|
|
|
|
|
outdir="pkg.bin.new/${extra_dir}${os}_${arch}"
|
|
|
|
|
osarch="${os}/${arch}"
|
|
|
|
|
if test "${osarch}" == "darwin/arm" -o "${osarch}" == "darwin/arm64" -o "${osarch}" == "freebsd/arm64" -o "${osarch}" == "windows/arm" -o "${osarch}" == "windows/arm64"
|
|
|
|
|
if test "${osarch}" == "darwin/arm" -o "${osarch}" == "darwin/arm64" -o "${osarch}" == "freebsd/arm64" -o "${osarch}" == "windows/arm" -o "${osarch}" == "windows/arm64" -o "${osarch}" == "freebsd/arm"
|
|
|
|
|
then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
|
|
|
|