From 6e6805cdb5e373228302e16a73480af24827e145 Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Tue, 23 May 2023 15:11:47 -0400 Subject: [PATCH 1/2] Update AOSP submodules dependencies to the latest master commits Signed-off-by: Andrew Gunnerson --- external/avb | 2 +- external/build | 2 +- external/update_engine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/avb b/external/avb index cb00b07..3210440 160000 --- a/external/avb +++ b/external/avb @@ -1 +1 @@ -Subproject commit cb00b07ed876873aab6a2678d524b31cd0745517 +Subproject commit 3210440973140a2646a2c88268ef899993e721ee diff --git a/external/build b/external/build index 43cbca3..2014bbb 160000 --- a/external/build +++ b/external/build @@ -1 +1 @@ -Subproject commit 43cbca31e6467f3a501187ce6fc9c538bea282d8 +Subproject commit 2014bbb8e7bf66085bf6e9d0f1460150bee98a13 diff --git a/external/update_engine b/external/update_engine index 9dbdcfb..e47767a 160000 --- a/external/update_engine +++ b/external/update_engine @@ -1 +1 @@ -Subproject commit 9dbdcfb78cc17bb6fcbe165cdb17cf8031b335b2 +Subproject commit e47767a5a860bbdee11798d6e95f6afbfef04e5b From e51c3661dda09023f58f5e38de297de10d52a059 Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Tue, 23 May 2023 15:27:20 -0400 Subject: [PATCH 2/2] tests: Update container image distros to the latest versions Signed-off-by: Andrew Gunnerson --- tests/distros/Containerfile.alpine | 2 +- tests/distros/Containerfile.arch-wine | 4 ++-- tests/distros/Containerfile.fedora | 2 +- tests/distros/Containerfile.ubuntu | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/distros/Containerfile.alpine b/tests/distros/Containerfile.alpine index 4b3aad3..37ca559 100644 --- a/tests/distros/Containerfile.alpine +++ b/tests/distros/Containerfile.alpine @@ -1,4 +1,4 @@ -FROM docker.io/library/alpine:3.17 +FROM docker.io/library/alpine:3.18 RUN apk add --no-cache openssl py3-lz4 py3-pip py3-protobuf # Alpine does not have strictyaml in its repos diff --git a/tests/distros/Containerfile.arch-wine b/tests/distros/Containerfile.arch-wine index 6024d5c..fb193f7 100644 --- a/tests/distros/Containerfile.arch-wine +++ b/tests/distros/Containerfile.arch-wine @@ -5,8 +5,8 @@ RUN pacman --noconfirm -Syu --needed aria2 xorg-server-xvfb \ # Yep, we're installing Windows msys2 packages directly on top of Arch -ARG KEYRING_VERSION=1~20221024-1 -ARG KEYRING_SHA256=e90fb4413f6056dbc8b2df9eac670924aa2851151bc97569e7df12c928acc209 +ARG KEYRING_VERSION=1~20230316-1 +ARG KEYRING_SHA256=eb672d0d41b2e857f97f0d9de6d3325113c992c5c1a9aab4bd468341e5471572 RUN aria2c https://mirror.msys2.org/msys/x86_64/msys2-keyring-${KEYRING_VERSION}-any.pkg.tar.zst \ --checksum SHA-256=${KEYRING_SHA256} \ diff --git a/tests/distros/Containerfile.fedora b/tests/distros/Containerfile.fedora index 88b0dc7..8bfa10f 100644 --- a/tests/distros/Containerfile.fedora +++ b/tests/distros/Containerfile.fedora @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora-toolbox:37 +FROM registry.fedoraproject.org/fedora-toolbox:38 RUN dnf install -y openssl python3-lz4 python3-protobuf python3-strictyaml \ && find /var/cache/dnf -mindepth 1 -delete diff --git a/tests/distros/Containerfile.ubuntu b/tests/distros/Containerfile.ubuntu index e555e65..d013250 100644 --- a/tests/distros/Containerfile.ubuntu +++ b/tests/distros/Containerfile.ubuntu @@ -1,4 +1,4 @@ -FROM docker.io/library/ubuntu:22.10 +FROM docker.io/library/ubuntu:23.04 RUN apt-get -y update \ && apt-get -y install openssl python3-lz4 python3-protobuf python3-strictyaml \