github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69003 from dims/ensure-reproducible-builds-pass-epoch-env-var 

Ensure reproducible builds - support for SOURCE_DATE_EPOCH with docke…
pull/58/head
k8s-ci-robot 2018-09-27 04:49:10 -07:00 committed by GitHub
parent 43a9e08e02 d9cfd77149
commit 807eb6b24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/common.sh
View File

@ -600,6 +600,7 @@ function kube::build::run_build_command_ex() {
--env "GOFLAGS=${GOFLAGS:-}" --env "GOFLAGS=${GOFLAGS:-}"
--env "GOLDFLAGS=${GOLDFLAGS:-}" --env "GOLDFLAGS=${GOLDFLAGS:-}"
--env "GOGCFLAGS=${GOGCFLAGS:-}" --env "GOGCFLAGS=${GOGCFLAGS:-}"
--env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}"
) )
if [[ -n "${DOCKER_CGROUP_PARENT:-}" ]]; then if [[ -n "${DOCKER_CGROUP_PARENT:-}" ]]; then

11
hack/lib/golang.sh
View File

@ -557,6 +557,7 @@ kube::golang::build_some_binaries() {
fi fi
else else
V=2 kube::log::info "Coverage is disabled." V=2 kube::log::info "Coverage is disabled."
kube::log::status "go install" "${build_args[@]}" "$@"
go install "${build_args[@]}" "$@" go install "${build_args[@]}" "$@"
fi fi
} }
@ -586,6 +587,7 @@ kube::golang::build_binaries_for_platform() {
-installsuffix static -installsuffix static
${goflags:+"${goflags[@]}"} ${goflags:+"${goflags[@]}"}
-gcflags "${gogcflags:-}" -gcflags "${gogcflags:-}"
-asmflags "${goasmflags:-}"
-ldflags "${goldflags:-}" -ldflags "${goldflags:-}"
) )
CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}" CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}"
@ -595,6 +597,7 @@ kube::golang::build_binaries_for_platform() {
build_args=( build_args=(
${goflags:+"${goflags[@]}"} ${goflags:+"${goflags[@]}"}
-gcflags "${gogcflags:-}" -gcflags "${gogcflags:-}"
-asmflags "${goasmflags:-}"
-ldflags "${goldflags:-}" -ldflags "${goldflags:-}"
) )
kube::golang::build_some_binaries "${nonstatics[@]}" kube::golang::build_some_binaries "${nonstatics[@]}"
@ -608,6 +611,7 @@ kube::golang::build_binaries_for_platform() {
go test -c \ go test -c \
${goflags:+"${goflags[@]}"} \ ${goflags:+"${goflags[@]}"} \
-gcflags "${gogcflags:-}" \ -gcflags "${gogcflags:-}" \
-asmflags "${goasmflags:-}" \
-ldflags "${goldflags:-}" \ -ldflags "${goldflags:-}" \
-o "${outfile}" \ -o "${outfile}" \
"${testpkg}" "${testpkg}"
@ -661,10 +665,11 @@ kube::golang::build_binaries() {
host_platform=$(kube::golang::host_platform) host_platform=$(kube::golang::host_platform)
# Use eval to preserve embedded quoted strings. # Use eval to preserve embedded quoted strings.
local goflags goldflags gogcflags local goflags goldflags goasmflags gogcflags
eval "goflags=(${GOFLAGS:-})" eval "goflags=(${GOFLAGS:-})"
goldflags="${GOLDFLAGS:-} $(kube::version::ldflags)" goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)"
gogcflags="${GOGCFLAGS:-}" goasmflags="-trimpath=${KUBE_ROOT}"
gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
local -a targets=() local -a targets=()
local arg local arg