From 03e00604c0bc6b1b58f07652e5cc875d7a2d16a5 Mon Sep 17 00:00:00 2001
From: Privacy Sandbox Team <noreply@google.com>
Date: Thu, 31 Oct 2024 15:22:40 -0400
Subject: [PATCH] Release 0.73.0 (2024-10-31)

### Features

* Create .clang.bazelrc

### Dependencies

* **deps:** Upgrade clang to v18

Bug: b/373431150
Change-Id: I09744cfc1df473bd45115deb5346b91608218370
GitOrigin-RevId: d5746651bd7f8a62719c7a25506db28457748303
---
 .clang.bazelrc                   |  3 +++
 CHANGELOG.md                     | 12 ++++++++++++
 images/build-debian/install_apps | 23 ++++++++++++++++++-----
 tests/data/hashes/build-debian   |  2 +-
 version.txt                      |  2 +-
 5 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 .clang.bazelrc

diff --git a/.clang.bazelrc b/.clang.bazelrc
new file mode 100644
index 0000000..ccc43d7
--- /dev/null
+++ b/.clang.bazelrc
@@ -0,0 +1,3 @@
+build:cpp --client_env=BAZEL_CXXOPTS=-std=c++20
+build:cpp --cxxopt=-std=c++20
+build:cpp --client_env=CC=clang
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5e5a3d..25c9c5a 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.73.0 (2024-10-31)
+
+
+### Features
+
+* Create .clang.bazelrc
+
+
+### Dependencies
+
+* **deps:** Upgrade clang to v18
+
 ## 0.72.0 (2024-10-23)
 
 
diff --git a/images/build-debian/install_apps b/images/build-debian/install_apps
index 6a2a776..3aa3ad3 100755
--- a/images/build-debian/install_apps
+++ b/images/build-debian/install_apps
@@ -57,6 +57,7 @@ function install_python() {
 }
 
 function install_misc() {
+  declare -r arch="$1"
   apt-get --quiet install -y --no-install-recommends \
     apt-transport-https="2.4.*" \
     bsdmainutils \
@@ -82,6 +83,14 @@ function install_misc() {
     xz-utils="5.2.*" \
     zip="3.0-*"
 
+  if [[ ${arch} == "amd64" ]]; then
+    wget http://launchpadlibrarian.net/592499569/bzip2_1.0.8-5build1_amd64.deb
+    dpkg -i bzip2_1.0.8-5build1_amd64.deb
+  else
+    wget http://launchpadlibrarian.net/592503850/bzip2_1.0.8-5build1_arm64.deb
+    dpkg -i bzip2_1.0.8-5build1_arm64.deb
+  fi
+
   if [[ -n ${INSTALL_LOCALE} ]]; then
     printf "\nSetting locale to: %s\n" "${INSTALL_LOCALE}"
     locale-gen "${INSTALL_LOCALE}"
@@ -93,7 +102,7 @@ function install_clang() {
   curl --silent --fail --show-error --location --remote-name https://apt.llvm.org/llvm.sh
   chmod +x llvm.sh
   ./llvm.sh ${CLANG_VER}
-  apt-get --quiet install -y --no-install-recommends libc++-${CLANG_VER}-dev
+  apt-get --quiet install -y --no-install-recommends libc++-${CLANG_VER}-dev libc++abi-${CLANG_VER}-dev libclang-${CLANG_VER}-dev
   for prog in clang lldb lld ld.lld llvm-cov llvm-profdata; do
     update-alternatives --install /usr/bin/${prog} ${prog} /usr/bin/${prog}-${CLANG_VER} 100
   done
@@ -121,9 +130,13 @@ function install_docker() {
 }
 
 function install_clang_tidy() {
-  apt-get --quiet install -y clang-tidy
-  printf "clang-tidy version: %s\n" "$(clang-tidy --version)"
-  printf "clang-tidy config: %s\n" "$(clang-tidy -dump-config)"
+  printf "clang-tidy version: %s\n" "$(apt-cache show clang-tidy)"
+  apt-get --quiet install -y clang-tidy-${CLANG_VER}
+  printf "clang-tidy version: %s\n" "$(clang-tidy-${CLANG_VER} --version)"
+  printf "clang-tidy config: %s\n" "$(clang-tidy-${CLANG_VER} -dump-config)"
+  installed_clang_tidy=$(which clang-tidy-${CLANG_VER})
+  installed_dir="$(dirname "${installed_clang_tidy}")"
+  ln -s "${installed_clang_tidy}" "${installed_dir}"/clang-tidy
 }
 
 function cleanup() {
@@ -143,7 +156,7 @@ fi
 declare -x -r DEBIAN_FRONTEND=noninteractive
 
 apt_update
-install_misc
+install_misc "${BUILD_ARCH}"
 install_clang
 install_clang_tidy
 install_golang "${BUILD_ARCH}"
diff --git a/tests/data/hashes/build-debian b/tests/data/hashes/build-debian
index d1e462b..4096364 100644
--- a/tests/data/hashes/build-debian
+++ b/tests/data/hashes/build-debian
@@ -1 +1 @@
-1a595986739d80813edc0eb5736834589a1d39aaa28dcd18eb7c37484f27e3bb
+bfc34df959f55f87ba7395cfe1dc46479a7fa6319ebfcebcf6c97770fe449046
diff --git a/version.txt b/version.txt
index 67d5f80..598d667 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.72.0
\ No newline at end of file
+0.73.0
\ No newline at end of file