From 0653692cdf48b97bf27df8a9adccbf2163af3a57 Mon Sep 17 00:00:00 2001 From: Privacy Sandbox Team Date: Thu, 30 Nov 2023 06:30:33 -0500 Subject: [PATCH] Release 0.51.0 (2023-11-30) ### Bug Fixes * Clean go build cache at the end of image build script ### Dependencies * **deps:** Upgrade bazelisk to 1.19.0 Bug: N/A Change-Id: Ib34d029297ce0a914ee21a80ad94dd62ba3644da GitOrigin-RevId: 03f0970b8d7474ca885c195108cf8376c1370f05 --- CHANGELOG.md | 12 ++++++++++++ images/build-amazonlinux2/install_apps | 6 ++++++ images/build-amazonlinux2023/install_apps | 6 ++++++ images/build-debian/install_apps | 6 ++++-- images/install_golang_apps | 2 +- images/presubmit/install_apps | 11 +++++------ tests/data/hashes/build-amazonlinux2 | 2 +- tests/data/hashes/build-amazonlinux2023 | 2 +- tests/data/hashes/build-debian | 2 +- tests/data/hashes/presubmit | 2 +- version.txt | 2 +- 11 files changed, 39 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1734620..a8fee5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## 0.51.0 (2023-11-30) + + +### Bug Fixes + +* Clean go build cache at the end of image build script + + +### Dependencies + +* **deps:** Upgrade bazelisk to 1.19.0 + ## 0.50.0 (2023-11-06) diff --git a/images/build-amazonlinux2/install_apps b/images/build-amazonlinux2/install_apps index e0f46cc..00b6f31 100755 --- a/images/build-amazonlinux2/install_apps +++ b/images/build-amazonlinux2/install_apps @@ -86,6 +86,11 @@ function install_clang() { clang --version } +function cleanup() { + cd / + go clean -cache +} + if [[ ${VERBOSE} -eq 1 ]]; then printf "=== SHELL ENVIRONMENT ===\n" env @@ -99,3 +104,4 @@ install_golang "${BUILD_ARCH}" install_gcc install_packer install_python +cleanup diff --git a/images/build-amazonlinux2023/install_apps b/images/build-amazonlinux2023/install_apps index 722e89f..2cf1069 100755 --- a/images/build-amazonlinux2023/install_apps +++ b/images/build-amazonlinux2023/install_apps @@ -85,6 +85,11 @@ function install_clang() { clang --version } +function cleanup() { + cd / + go clean -cache +} + if [[ ${VERBOSE} -eq 1 ]]; then printf "=== SHELL ENVIRONMENT ===\n" env @@ -98,3 +103,4 @@ install_clang install_golang "${BUILD_ARCH}" install_gcc install_packer +cleanup diff --git a/images/build-debian/install_apps b/images/build-debian/install_apps index a93df03..5eaee12 100755 --- a/images/build-debian/install_apps +++ b/images/build-debian/install_apps @@ -122,11 +122,13 @@ function install_docker() { apt-get --quiet install -y --no-install-recommends docker-ce docker-ce-cli containerd.io } -function clean_debian() { +function cleanup() { apt-get --quiet autoremove -y apt-get autoclean apt-get clean rm -rf /var/lib/apt/lists + cd / + go clean -cache } if [[ ${VERBOSE} -eq 1 ]]; then @@ -140,4 +142,4 @@ install_clang install_golang "${BUILD_ARCH}" install_docker "${BUILD_ARCH}" install_python # should run after other install_* -clean_debian +cleanup diff --git a/images/install_golang_apps b/images/install_golang_apps index a10d33e..4254e43 100755 --- a/images/install_golang_apps +++ b/images/install_golang_apps @@ -31,7 +31,7 @@ while [[ $# -gt 0 ]]; do done function install_bazelisk() { - go install github.com/bazelbuild/bazelisk@v1.13.2 + go install github.com/bazelbuild/bazelisk@v1.19.0 BAZELISK="$(go env GOPATH)"/bin/bazelisk if [[ -n ${BAZEL_PATH} ]] && [[ -d ${BAZEL_PATH} ]]; then ln -s "${BAZELISK}" "${BAZEL_PATH}"/bazel diff --git a/images/presubmit/install_apps b/images/presubmit/install_apps index 64808cc..883ef65 100755 --- a/images/presubmit/install_apps +++ b/images/presubmit/install_apps @@ -37,10 +37,7 @@ while [[ $# -gt 0 ]]; do set -o xtrace shift ;; - -h | --help) - usage 0 - break - ;; + -h | --help) usage 0 ;; *) usage 0 ;; esac done @@ -102,11 +99,13 @@ function install_precommit() { rm -rf "${GIT_REPO}" } -function clean_debian() { +function cleanup() { apt-get --quiet autoremove -y apt-get autoclean apt-get clean rm -rf /var/lib/apt/lists + cd / + go clean -cache } if [[ ${VERBOSE} -eq 1 ]]; then @@ -126,4 +125,4 @@ install_packages install_golang "${ARCH}" install_docker install_precommit -clean_debian +cleanup diff --git a/tests/data/hashes/build-amazonlinux2 b/tests/data/hashes/build-amazonlinux2 index 770d475..b9750ae 100644 --- a/tests/data/hashes/build-amazonlinux2 +++ b/tests/data/hashes/build-amazonlinux2 @@ -1 +1 @@ -1feb61b0cf40e2797fc6a3425c3e50ce928ca194f3338d9a7155e51a4917312a +b35ee4e2b6210bc66e97083805642945433b0ef648a9d297a2a4ccdfb518413f diff --git a/tests/data/hashes/build-amazonlinux2023 b/tests/data/hashes/build-amazonlinux2023 index 036c5cd..7b70817 100644 --- a/tests/data/hashes/build-amazonlinux2023 +++ b/tests/data/hashes/build-amazonlinux2023 @@ -1 +1 @@ -a1c165d019f546e1fcad06506da3b274094b61a9add5576bf3fed6e5a45fb8d4 +7501f9f920a794ba6fa7c6cabb17d076ed3db0faf3fe5393e2904ce71978dec5 diff --git a/tests/data/hashes/build-debian b/tests/data/hashes/build-debian index 8ff298f..1a280c5 100644 --- a/tests/data/hashes/build-debian +++ b/tests/data/hashes/build-debian @@ -1 +1 @@ -c5c1f804b797e6d37fe7d1766123706b9a9db5e1ac2f99b131624adf0eac7718 +d1e3d62592bd4f05de6ca85c030578fc10c3430fdbad48a368ddb1e4618374c7 diff --git a/tests/data/hashes/presubmit b/tests/data/hashes/presubmit index 8e2b4d7..ada6538 100644 --- a/tests/data/hashes/presubmit +++ b/tests/data/hashes/presubmit @@ -1 +1 @@ -40b437991cd3ec239fc0d0eef162005dc62784def9c40548f3ea235d99c2e5a0 +79f2509c74607ab33bc5fe3f425f61ddf89e2f75efc299b1a5a7a3039367c90e diff --git a/version.txt b/version.txt index 84767f2..fdbbf17 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.50.0 \ No newline at end of file +0.51.0 \ No newline at end of file