Merge pull request #110 from privacysandbox/release-0.76.0

Release 0.76.0
privacysandbox · Dec 25, 2024 · dae6759 · dae6759
2 parents 3e3f435 + 2393543
commit dae6759
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 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.76.0 (2024-12-16)
+
+
+### Features
+
+* Remove support for Amazon Linux 2
+
 ## 0.75.1 (2024-11-22)
 
 

diff --git a/images/build-amazonlinux2/.bazelversion b/images/build-amazonlinux2/.bazelversion
diff --git a/images/build-amazonlinux2/Dockerfile b/images/build-amazonlinux2/Dockerfile
diff --git a/images/build-amazonlinux2/generate_system_bazelrc b/images/build-amazonlinux2/generate_system_bazelrc
diff --git a/images/build-amazonlinux2/get_workspace_mount b/images/build-amazonlinux2/get_workspace_mount
diff --git a/images/build-amazonlinux2/gitconfig b/images/build-amazonlinux2/gitconfig
diff --git a/images/build-amazonlinux2/install_apps b/images/build-amazonlinux2/install_apps
diff --git a/images/build-amazonlinux2/install_go.sh b/images/build-amazonlinux2/install_go.sh
diff --git a/images/build-amazonlinux2/install_golang_apps b/images/build-amazonlinux2/install_golang_apps
diff --git a/images/build-amazonlinux2/test/commands.yaml b/images/build-amazonlinux2/test/commands.yaml
diff --git a/tests/data/hashes/build-amazonlinux2 b/tests/data/hashes/build-amazonlinux2
diff --git a/tools/builder.sh b/tools/builder.sh
@@ -132,7 +132,7 @@ function builder::docker_img_to_nitro() {
   local -r docker_image_tag="$3"
   local -r output_path="$4"
   local -r eif_name="$5"
-  local -r image="${6-build-amazonlinux2}"
+  local -r image="${6-build-amazonlinux2023}"
   local -r temp_tag="$(mktemp --dry-run temp-XXXXXX)"
   docker load -i "${docker_image_tar}"
   # add a temp tag to reduce the chance of conflicts or race conditions
@@ -155,7 +155,7 @@ function builder::docker_img_to_nitro() {
 function builder::docker_uri_to_nitro() {
   local -r docker_uri="$1"
   local -r output_base_fname="$2"
-  local -r image="${3-build-amazonlinux2}"
+  local -r image="${3-build-amazonlinux2023}"
   local -r output_eif="${output_base_fname}".eif
   local -r output_json="${output_base_fname}".json
   local -r output_pcr0_json="${output_base_fname}".pcr0.json
@@ -189,10 +189,6 @@ function builder::cbuild_al() {
   "${cbuild}" ${CBUILD_ARGS} "${env_args[@]}" --image "${image}" --cmd "$*"
 }
 
-function builder::cbuild_al2() {
-  builder::cbuild_al build-amazonlinux2 "$@"
-}
-
 function builder::cbuild_al2023() {
   builder::cbuild_al build-amazonlinux2023 "$@"
 }

diff --git a/tools/cbuild b/tools/cbuild
@@ -19,7 +19,6 @@ IMAGE="build-debian"
 VERBOSE=0
 declare -r -a IMAGE_LIST=(
   "build-debian"
-  "build-amazonlinux2"
   "build-amazonlinux2023"
   "presubmit"
 )

diff --git a/tools/convert-docker-to-nitro b/tools/convert-docker-to-nitro
@@ -22,7 +22,7 @@ function cleanup() {
   exit ${status}
 }
 
-declare BUILDER_IMAGE_NAME=build-amazonlinux2
+declare BUILDER_IMAGE_NAME=build-amazonlinux2023
 
 function usage() {
   declare -r -i exitval=${1-1}

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.75.1
+0.76.0