Skip to content

Commit

Permalink
Release 0.75.1 (2024-11-22)
Browse files Browse the repository at this point in the history
### Bug Fixes

* Revert to ubuntu:20

Bug: b/373923491
Change-Id: I32f1e7151cdd20a34e8d9250fd4e3804c9666c3b
GitOrigin-RevId: 7713a0fb2bb28dc16f775f84cf54dce6a5bbdbb5
  • Loading branch information
Privacy Sandbox Team authored and a-shruti committed Nov 25, 2024
1 parent 4ccc5f6 commit f5b7f85
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 33 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.75.1 (2024-11-22)


### Bug Fixes

* Revert to ubuntu:20

## 0.75.0 (2024-11-21)


Expand Down
6 changes: 3 additions & 3 deletions images/build-debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# limitations under the License.

# Use fixed manifest digest to ensure reproducible.
# https://hub.docker.com/layers/library/ubuntu/jammy-20240911.1/images/sha256-3d1556a8a18cf5307b121e0a98e93f1ddf1f3f8e092f1fddfd941254785b95d7?context=explore
# ubuntu v22.04, jammy-20240911.1
ARG BASE_IMAGE=ubuntu@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe
# https://hub.docker.com/layers/library/ubuntu/focal-20240530/images/sha256-85c08a37b74bc18a7b3f8cf89aabdfac51c525cdbc193a753f7907965e310ec2
# ubuntu v20.04, focal-20240530
ARG BASE_IMAGE=ubuntu@sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e

# ignore this hadolint error as BASE_IMAGE contains an image tag
# hadolint ignore=DL3006
Expand Down
2 changes: 1 addition & 1 deletion images/build-debian/compile_libprofiler
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function install_build_tools() {
lsb-release="11.1.*" \
make="4.*" \
software-properties-common="0.99.*" \
wget="1.21.*"
wget="1.20.*"
}

function install_clang() {
Expand Down
50 changes: 24 additions & 26 deletions images/build-debian/install_apps
Original file line number Diff line number Diff line change
Expand Up @@ -44,53 +44,51 @@ function apt_update() {
}

function install_python() {
local -r ver="3.10"
apt-get --quiet install -y --no-install-recommends \
python${ver}-venv="${ver}.*" python${ver}-dev python3-clang python3-numpy
python3.9-venv="3.9.*" python3.9-dev
mkdir -p /opt/bin
update-alternatives \
--force \
--install /opt/bin/python3 python3-opt /usr/bin/python${ver} 100 \
--slave /usr/bin/python3 python3-usr /usr/bin/python${ver} \
--slave /usr/bin/python python-usr /usr/bin/python${ver} \
--slave /opt/bin/python python /usr/bin/python${ver}
--install /opt/bin/python3 python3-opt /usr/bin/python3.9 100 \
--slave /usr/bin/python3 python3-usr /usr/bin/python3.9 \
--slave /usr/bin/python python-usr /usr/bin/python3.9 \
--slave /opt/bin/python python /usr/bin/python3.9
curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
/usr/bin/python3 /tmp/get-pip.py
rm -f /tmp/get-pip.py
/usr/bin/python3 -m pip --version
/usr/bin/python3 -m pip install \
"libclang~=${CLANG_VER}.0" \
"numpy~=1.25"
}

function install_misc() {
declare -r arch="$1"
apt-get --quiet install -y --no-install-recommends \
apt-transport-https="2.4.*" \
apt-transport-https="2.0.*" \
bsdmainutils \
ca-certificates \
chrpath="0.16-*" \
curl="7.81.*" \
curl="7.68.*" \
file="1:5.*" \
gawk="1:5.*" \
gettext="0.21*" \
git="1:2.34.*" \
gettext="0.19.*" \
git="1:2.25.*" \
gnupg="2.2.*" \
google-perftools="2.*" \
jq="1.6-*" \
libcurl4="7.81.*" \
locales="2.35-*" \
libcurl4="7.68.*" \
locales="2.31-*" \
lsb-release="11.1.*" \
openssh-client="1:8.9*" \
openssh-client="1:8.2*" \
patch="2.7.*" \
rename="1.30-*" \
rename="1.10-*" \
software-properties-common="0.99.*" \
unzip="6.0-*" \
wget="1.21.*" \
wget="1.20.*" \
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}"
Expand Down Expand Up @@ -144,11 +142,11 @@ function install_clang_tidy() {
function install_gvisor_deps() {
declare -r arch="$1"
apt-get --quiet install -y --no-install-recommends \
crossbuild-essential-amd64="12.9*" \
crossbuild-essential-arm64="12.9*" \
crossbuild-essential-amd64="12.8*" \
crossbuild-essential-arm64="12.8*" \
libbpf-dev="1:0.5.0-*"
if [[ ${arch} == amd64 ]]; then
apt-get install -y --no-install-recommends libc6-dev-i386="2.35-*"
apt-get install -y --no-install-recommends libc6-dev-i386="2.31-*"
fi
}

Expand Down
2 changes: 1 addition & 1 deletion tests/data/hashes/build-debian
Original file line number Diff line number Diff line change
@@ -1 +1 @@
240b6be7b685c614309e4eb852af37dabe3f808a8e17051d817ba60351ad2acf
4c70adb4f8c4820b7d59e290f882858bf1e9e5be4d92788d0e22028d16c6e7a3
2 changes: 1 addition & 1 deletion tools/get-architecture
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ function _cleanup() {
if [[ -n ${BUILD_ARCH} ]]; then
printf "%s\n" "${BUILD_ARCH}"
else
docker run --rm --entrypoint=/usr/bin/dpkg ubuntu:22.04 --print-architecture
docker run --rm --entrypoint=/usr/bin/dpkg ubuntu:20.04 --print-architecture
fi
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.75.0
0.75.1

0 comments on commit f5b7f85

Please sign in to comment.