From df8d172536d6d4c13e4a7deffa7c4c38b9409578 Mon Sep 17 00:00:00 2001
From: Privacy Sandbox Team <noreply@google.com>
Date: Wed, 24 May 2023 13:18:36 -0400
Subject: [PATCH] Release 0.28.0 (2023-05-24)

### Features

* Update ca-certificates

### Bug Fixes

* Downgrade to clang v15
* Use builders version.txt for tarfile tag

Bug: N/A
Change-Id: If959032e2b6273ef11544ea0e4ad7f4963e4bc99
GitOrigin-RevId: d70a49f3ac931f3af3d607b36ba42bae49eefd69
---
 CHANGELOG.md                     | 13 +++++++++++++
 images/build-debian/install_apps |  6 +++---
 images/presubmit/install_apps    |  2 +-
 tools/get-builder-image-tagged   |  9 +++++----
 version.txt                      |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e79d7e..11f5152 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.28.0 (2023-05-24)
+
+
+### Features
+
+* Update ca-certificates
+
+
+### Bug Fixes
+
+* Downgrade to clang v15
+* Use builders version.txt for tarfile tag
+
 ## 0.27.0 (2023-05-23)
 
 
diff --git a/images/build-debian/install_apps b/images/build-debian/install_apps
index 9eadf3b..fb91552 100755
--- a/images/build-debian/install_apps
+++ b/images/build-debian/install_apps
@@ -45,7 +45,7 @@ function apt_update() {
 function install_misc() {
   DEBIAN_FRONTEND=noninteractive apt-get --quiet install -y --no-install-recommends \
     apt-transport-https="2.0.*" \
-    ca-certificates="20211016ubuntu0.20.04.1" \
+    ca-certificates \
     chrpath="0.16-*" \
     libcurl4="7.68.*" \
     curl="7.68.*" \
@@ -54,7 +54,7 @@ function install_misc() {
     git="1:2.25.*" \
     gnupg="2.2.*" \
     locales="2.31-*" \
-    lsb-release="11.1.0*" \
+    lsb-release="11.1.*" \
     openjdk-11-jdk="11.0.*" \
     python3.9-venv="3.9.*" \
     rename="1.10-*" \
@@ -74,7 +74,7 @@ function install_misc() {
 }
 
 function install_clang() {
-  declare -r -i clang_ver=16
+  declare -r -i clang_ver=15
   curl --silent --fail --show-error --location --remote-name https://apt.llvm.org/llvm.sh
   chmod +x llvm.sh
   ./llvm.sh ${clang_ver}
diff --git a/images/presubmit/install_apps b/images/presubmit/install_apps
index 779f68c..64808cc 100755
--- a/images/presubmit/install_apps
+++ b/images/presubmit/install_apps
@@ -55,7 +55,7 @@ function apt_update() {
 function install_packages() {
   DEBIAN_FRONTEND=noninteractive apt-get --quiet install -y --no-install-recommends \
     apt-transport-https="2.0.*" \
-    ca-certificates="20211016ubuntu0.20.04.1" \
+    ca-certificates \
     libcurl4="7.68.*" \
     curl="7.68.*" \
     gnupg="2.2.*" \
diff --git a/tools/get-builder-image-tagged b/tools/get-builder-image-tagged
index f145010..a725faa 100755
--- a/tools/get-builder-image-tagged
+++ b/tools/get-builder-image-tagged
@@ -84,8 +84,9 @@ USAGE
 
 TOOLS_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 readonly TOOLS_DIR
-readonly ETC_DIR="${TOOLS_DIR}"/../etc
-readonly IMAGES_DIR="${TOOLS_DIR}"/../images
+readonly BUILDERS_DIR="${TOOLS_DIR}"/..
+readonly ETC_DIR="${BUILDERS_DIR}"/etc
+readonly IMAGES_DIR="${BUILDERS_DIR}"/images
 declare -i SHA_ONLY=0
 declare -i BUILD_IMAGE_IF_NEEDED=1
 declare -i VERBOSE=0
@@ -162,7 +163,7 @@ Dockerfile
 
 BUILD_OUTPUT="$(make_temp .log)"
 readonly BUILD_OUTPUT
-BUILDSYS_VERSION="$(cat "${WORKSPACE}"/version.txt)"
+BUILDSYS_VERSION="$(<"${BUILDERS_DIR}"/version.txt)"
 readonly BUILDSYS_VERSION
 readonly TAR_IMAGE="builders/tar-get-builder-image-tagged:v${BUILDSYS_VERSION}"
 TAR_IMAGE_HASH="$(docker image ls --filter "reference=${TAR_IMAGE}" --quiet)"
@@ -229,7 +230,7 @@ SHAFILE="$(make_temp .sha)"
 readonly SHAFILE
 # use the tarfile size and file content to generate a sha256 hash
 _tar_for_dir "${TEMPTAR}" "${SHAFILE}" "${IMAGE_PATH_FULL}"
-SHA="$(cat "${SHAFILE}")"
+SHA="$(<"${SHAFILE}")"
 readonly SHA
 ARCH="$("${TOOLS_DIR}"/get-architecture)"
 readonly ARCH
diff --git a/version.txt b/version.txt
index 81566e4..022a033 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.27.0
\ No newline at end of file
+0.28.0
\ No newline at end of file