Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure CCache disabled for all reproducible jdk-17 & jdk-19+ builds #3470

Merged
merged 3 commits into from
Sep 4, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions sbin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,8 @@ configureReproducibleBuildParameter() {
# Enable reproducible builds implicitly with --with-source-date
if [ "${BUILD_CONFIG[RELEASE]}" == "true" ]
then
# TZ issue: https://github.com/adoptium/temurin-build/issues/3075
export TZ=UTC
# Use release date and disable CCache( remove --enable-ccache if exist)
addConfigureArg "--with-source-date=version" " --disable-ccache"
CONFIGURE_ARGS="${CONFIGURE_ARGS//--enable-ccache/}"
# Use release date
addConfigureArg "--with-source-date=" "version"
else
# Use BUILD_TIMESTAMP date

Expand All @@ -120,6 +117,14 @@ configureReproducibleBuildParameter() {
# Use supplied date
addConfigureArg "--with-hotspot-build-time=" "'${BUILD_CONFIG[BUILD_TIMESTAMP]}'"
fi

# TZ issue: https://github.com/adoptium/temurin-build/issues/3075
export TZ=UTC

# disable CCache (remove --enable-ccache if exist)
addConfigureArg "--disable-ccache" ""
CONFIGURE_ARGS="${CONFIGURE_ARGS//--enable-ccache/}"

# Ensure reproducible and comparable binary with a unique build user identifier
addConfigureArg "--with-build-user=" "admin"
if [ "${BUILD_CONFIG[OS_KERNEL_NAME]}" == "aix" ]; then
Expand Down
Loading