From 0bc24ca219d93df7b3524042fa157aa5513082fd Mon Sep 17 00:00:00 2001 From: Privacy Sandbox Team Date: Thu, 17 Oct 2024 22:32:30 -0400 Subject: [PATCH] Release 0.71.0 (2024-10-18) ### Dependencies * **deps:** Pin AmazonLinux2023 Nitro CLI versions * **deps:** Update AmazonLinux base images to 2024-10-01 * **deps:** Upgrade pre-commit and pylint Bug: b/374196009 Change-Id: I81175710f82bf4fc9270beca8a69a32dd62160ce GitOrigin-RevId: bc7d71c39eef6236b455e519c82add2439a6e593 --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 9 +++++++++ images/build-amazonlinux2/Dockerfile | 2 +- images/build-amazonlinux2023/Dockerfile | 2 +- images/build-amazonlinux2023/install_apps | 16 +++++++++++++--- images/presubmit/install_apps | 4 ++-- tests/data/hashes/build-amazonlinux2 | 2 +- tests/data/hashes/build-amazonlinux2023 | 2 +- tests/data/hashes/presubmit | 2 +- version.txt | 2 +- 10 files changed, 31 insertions(+), 12 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3f853aa..67c5de5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -109,7 +109,7 @@ repos: - markdown - repo: https://github.com/DavidAnson/markdownlint-cli2 - rev: v0.13.0 + rev: v0.7.1 hooks: - id: markdownlint-cli2 name: lint markdown diff --git a/CHANGELOG.md b/CHANGELOG.md index 3938bc4..164f099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ 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.71.0 (2024-10-18) + + +### Dependencies + +* **deps:** Pin AmazonLinux2023 Nitro CLI versions +* **deps:** Update AmazonLinux base images to 2024-10-01 +* **deps:** Upgrade pre-commit and pylint + ## 0.70.0 (2024-10-10) diff --git a/images/build-amazonlinux2/Dockerfile b/images/build-amazonlinux2/Dockerfile index 6ccce80..057b02e 100644 --- a/images/build-amazonlinux2/Dockerfile +++ b/images/build-amazonlinux2/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM amazonlinux:2.0.20240412.0 +FROM amazonlinux:2.0.20241001.0 COPY /install_apps install_golang_apps install_go.sh generate_system_bazelrc .bazelversion /scripts/ COPY get_workspace_mount /usr/local/bin diff --git a/images/build-amazonlinux2023/Dockerfile b/images/build-amazonlinux2023/Dockerfile index c7d3509..dc5d5fb 100644 --- a/images/build-amazonlinux2023/Dockerfile +++ b/images/build-amazonlinux2023/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM amazonlinux:2023.5.20240722.0 +FROM amazonlinux:2023.5.20241001.1 COPY /install_apps install_golang_apps install_go.sh generate_system_bazelrc .bazelversion /scripts/ COPY get_workspace_mount /usr/local/bin diff --git a/images/build-amazonlinux2023/install_apps b/images/build-amazonlinux2023/install_apps index 16378fa..1987184 100755 --- a/images/build-amazonlinux2023/install_apps +++ b/images/build-amazonlinux2023/install_apps @@ -46,9 +46,19 @@ function install_python() { } function install_nitro() { + local -r arch="$1" + local -r -A extensions=( + [amd64]="x86_64" + [arm64]="aarch64" + ) + local -r ext="${extensions[${arch}]}" + if [[ -z ${ext} ]]; then + printf "Unrecognized or unsupported architecture for nitro: %s\n" "${arch}" &>/dev/stderr + return 1 + fi dnf install -y \ - "aws-nitro-enclaves-cli-1.3.*" \ - "aws-nitro-enclaves-cli-devel-1.3.*" + "aws-nitro-enclaves-cli-1.3.1-0.amzn2023.${ext}" \ + "aws-nitro-enclaves-cli-devel-1.3.1-0.amzn2023.${ext}" } function install_gcc() { @@ -91,7 +101,7 @@ fi install_python dnf_update -install_nitro +install_nitro "${BUILD_ARCH}" install_misc install_clang install_golang "${BUILD_ARCH}" diff --git a/images/presubmit/install_apps b/images/presubmit/install_apps index 3986ec6..501d445 100755 --- a/images/presubmit/install_apps +++ b/images/presubmit/install_apps @@ -82,8 +82,8 @@ function install_docker() { function install_precommit() { /usr/bin/python3.12 -m venv "${PRE_COMMIT_VENV_DIR}" "${PRE_COMMIT_VENV_DIR}"/bin/pip install \ - pre-commit~=3.7 \ - pylint~=3.1.0 + pre-commit~=4.0 \ + pylint~=3.1 "${PRE_COMMIT_TOOL}" --version # initialize pre-commit cache, which needs a git repo (a temporary will suffice) diff --git a/tests/data/hashes/build-amazonlinux2 b/tests/data/hashes/build-amazonlinux2 index 0ecc1d5..49a5d7d 100644 --- a/tests/data/hashes/build-amazonlinux2 +++ b/tests/data/hashes/build-amazonlinux2 @@ -1 +1 @@ -b736a985e1dabca78d7b568b1bed9dc4d57d64ee89b75a60704d3df535de0313 +566ebf3a2f4bc0a9675b51ee68de67bf0ea6d90c1fbbb9dcd9096002a24ed365 diff --git a/tests/data/hashes/build-amazonlinux2023 b/tests/data/hashes/build-amazonlinux2023 index 686aa4a..8b49a42 100644 --- a/tests/data/hashes/build-amazonlinux2023 +++ b/tests/data/hashes/build-amazonlinux2023 @@ -1 +1 @@ -bf2a5b9d4f49488600efac473c911d28d494cd2e2e611ebcbdeb4d0a83c469ca +9cde9b8ca775243a0093c486e229f3fa885bead7e12afc3bdd1408a919076e7e diff --git a/tests/data/hashes/presubmit b/tests/data/hashes/presubmit index b370015..03a9f17 100644 --- a/tests/data/hashes/presubmit +++ b/tests/data/hashes/presubmit @@ -1 +1 @@ -f7e849db94d0f6c3fb6ef4a3e12dfce53ae2987015040511236a53fd516298fa +59738b43c28ecd1582112ce61fdbb697aa4952636b99955fdecdcc624bd245fe diff --git a/version.txt b/version.txt index d9bd950..f91d144 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.70.0 \ No newline at end of file +0.71.0 \ No newline at end of file