diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 7657c77b0e..34cd86b0f1 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,13 +1,13 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:noble-20260610 +FROM ubuntu:noble-20260810 ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb -ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.19+10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.19_10.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.19_10.tar.gz +ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.20+8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.20_8.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.20_8.tar.gz ADD https://dl.google.com/android/repository/commandlinetools-linux-15859902_latest.zip /commandlinetools-linux-15859902_latest.zip -ADD https://dl.google.com/android/repository/build-tools_r36.1_linux.zip /build-tools_r36.1_linux.zip +ADD https://dl.google.com/android/repository/build-tools_r37_linux.zip /build-tools_r37_linux.zip ADD https://dl.google.com/android/repository/platform-36_r02.zip /platform-36_r02.zip -ADD https://dl.google.com/android/repository/platform-tools_r37.0.0-linux.zip /platform-tools_r37.0.0-linux.zip +ADD https://dl.google.com/android/repository/platform-tools_r37.0.1-linux.zip /platform-tools_r37.0.1-linux.zip ADD https://dl.google.com/android/repository/android-ndk-r29-linux.zip /android-ndk-r29-linux.zip # Add apt packages @@ -70,27 +70,27 @@ apt-get -y dist-upgrade apt-get -y --no-install-recommends install $APT_PACKAGES # OpenJDK -tar xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.19_10.tar.gz -rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.19_10.tar.gz +tar xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.20_8.tar.gz +rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.20_8.tar.gz # Android SDK unzip -q commandlinetools-linux-15859902_latest.zip -d android-sdk rm commandlinetools-linux-15859902_latest.zip -unzip -q build-tools_r36.1_linux.zip -d android-sdk/build-tools -mv android-sdk/build-tools/android-16 android-sdk/build-tools/36.1.0 -rm build-tools_r36.1_linux.zip +unzip -q build-tools_r37_linux.zip -d android-sdk/build-tools +mv android-sdk/build-tools/android-37.0 android-sdk/build-tools/37.0.0 +rm build-tools_r37_linux.zip unzip -q platform-36_r02.zip -d android-sdk/platforms rm platform-36_r02.zip find android-sdk/platforms -type d -exec chmod o+rx '{}' ';' find android-sdk/platforms -type f -exec chmod o+r '{}' ';' -unzip -q platform-tools_r37.0.0-linux.zip -d android-sdk -rm platform-tools_r37.0.0-linux.zip +unzip -q platform-tools_r37.0.1-linux.zip -d android-sdk +rm platform-tools_r37.0.1-linux.zip # JRE for sdk setup -export JAVA_HOME=/jdk-17.0.19+10 +export JAVA_HOME=/jdk-17.0.20+8 yes | /android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=/android-sdk --licenses # Android NDK @@ -99,7 +99,7 @@ rm -f android-ndk-r29-linux.zip END_OF_SCRIPT -ENV JAVA_HOME="/jdk-17.0.19+10" +ENV JAVA_HOME="/jdk-17.0.20+8" ENV ANDROID_HOME="/android-sdk" diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index 384fb12c03..daf9ee5def 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -30,7 +30,7 @@ jobs: - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - name: ANDROID_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2026-07-15' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2026-08-21' - name: LINUX_DOCKER_IMAGE value: ${{ parameters.linuxDockerImage }} steps: diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 1077c878fb..03961d3878 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -9,11 +9,11 @@ parameters: - name: x64LinuxDockerImage displayName: 'Linux Docker Image to use for the x64 Linux build' type: string - default: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-07-15' + default: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-08-21' - name: arm64LinuxDockerImage displayName: 'Linux Docker Image to use for the arm64 Linux build' type: string - default: 'vcpkgandroidwus.azurecr.io/vcpkg-arm64-linux:2026-07-15' + default: 'vcpkgandroidwus.azurecr.io/vcpkg-arm64-linux:2026-08-21' - name: tripletPattern displayName: 'Enable triplets which contain this substring (^ matches begin, $ matches end)' type: string diff --git a/scripts/azure-pipelines/linux-arm64/Dockerfile b/scripts/azure-pipelines/linux-arm64/Dockerfile index fd8cd8f753..5ea572da57 100644 --- a/scripts/azure-pipelines/linux-arm64/Dockerfile +++ b/scripts/azure-pipelines/linux-arm64/Dockerfile @@ -1,7 +1,7 @@ -FROM ubuntu:noble-20260610 +FROM ubuntu:noble-20260810 ARG BUILD_DATE -ARG POWERSHELL_VERSION=7.6.3 +ARG POWERSHELL_VERSION=7.6.4 ENV DEBIAN_FRONTEND=noninteractive RUN <