From 5a6c88e37e2ce39ace50297d25e14ec739c7626f Mon Sep 17 00:00:00 2001 From: paketo-bot <62766270+paketo-bot@users.noreply.github.com> Date: Fri, 15 Mar 2024 09:14:57 -0700 Subject: [PATCH] Updates github-config (#625) * Updating github-config * Updating github-config * Updating github-config * Updating github-config * Updating github-config * enabling experimental features through options.json --------- Co-authored-by: Costas Papastathis --- scripts/.syncignore | 1 + scripts/.util/tools.json | 6 +++--- scripts/.util/tools.sh | 11 +++++++++++ scripts/integration.sh | 1 - scripts/options.json | 3 +++ 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 scripts/.syncignore create mode 100644 scripts/options.json diff --git a/scripts/.syncignore b/scripts/.syncignore new file mode 100644 index 00000000..ac5fd814 --- /dev/null +++ b/scripts/.syncignore @@ -0,0 +1 @@ +options.json diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index 27bf5a5c..618569b2 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { - "createpackage": "v1.68.1", - "jam": "v2.7.0", - "pack": "v0.33.1" + "createpackage": "v1.68.2", + "jam": "v2.7.1", + "pack": "v0.33.2" } diff --git a/scripts/.util/tools.sh b/scripts/.util/tools.sh index 35addb02..801e6acb 100644 --- a/scripts/.util/tools.sh +++ b/scripts/.util/tools.sh @@ -135,6 +135,13 @@ function util::tools::pack::install() { version="$(jq -r .pack "$(dirname "${BASH_SOURCE[0]}")/tools.json")" + local pack_config_enable_experimental + if [ -f "$(dirname "${BASH_SOURCE[0]}")/../options.json" ]; then + pack_config_enable_experimental="$(jq -r .pack_config_enable_experimental "$(dirname "${BASH_SOURCE[0]}")/../options.json")" + else + pack_config_enable_experimental="false" + fi + tmp_location="/tmp/pack.tgz" curl_args=( "--fail" @@ -158,6 +165,10 @@ function util::tools::pack::install() { tar xzf "${tmp_location}" -C "${dir}" chmod +x "${dir}/pack" + if [[ "${pack_config_enable_experimental}" == "true" ]]; then + "${dir}"/pack config experimental true + fi + rm "${tmp_location}" else util::print::info "Using pack $("${dir}"/pack version)" diff --git a/scripts/integration.sh b/scripts/integration.sh index 48363927..46ffbdb4 100755 --- a/scripts/integration.sh +++ b/scripts/integration.sh @@ -147,7 +147,6 @@ function tests::run() { util::print::title "Run Buildpack Runtime Integration Tests" util::print::info "Using ${1} as builder..." - pack config experimental true export CGO_ENABLED=0 pushd "${BUILDPACKDIR}" > /dev/null if GOMAXPROCS="${GOMAXPROCS:-4}" go test -count=1 -timeout 0 ./integration/... -v -run Integration | tee "${2}"; then diff --git a/scripts/options.json b/scripts/options.json new file mode 100644 index 00000000..89ee79c6 --- /dev/null +++ b/scripts/options.json @@ -0,0 +1,3 @@ +{ + "pack_config_enable_experimental": true +}