3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

Add NDK r26 to CI image (#38975)

Browse Source
This commit is contained in:
Kai Pastor 2024-06-08 19:54:48 +02:00 committed by GitHub
parent 14b91796a6
commit ad25766aef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/azure-pipelines/android/Dockerfile
View File

@ -1,9 +1,10 @@
# syntax=docker/dockerfile:1.4 # syntax=docker/dockerfile:1.4
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry" # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
FROM ubuntu:focal-20240427 FROM ubuntu:focal-20240530
ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip
ADD https://dl.google.com/android/repository/android-ndk-r26d-linux.zip /android-ndk-r26d-linux.zip
# Add apt packages # Add apt packages
@ -62,6 +63,8 @@ apt-get -y --no-install-recommends install $APT_PACKAGES
# Android NDK # Android NDK
unzip /android-ndk-r25c-linux.zip unzip /android-ndk-r25c-linux.zip
rm -f android-ndk-r25c-linux.zip rm -f android-ndk-r25c-linux.zip
unzip /android-ndk-r26d-linux.zip
rm -f android-ndk-r26d-linux.zip
END_OF_SCRIPT END_OF_SCRIPT
ENV ANDROID_NDK_HOME /android-ndk-r25c ENV ANDROID_NDK_HOME /android-ndk-r25c

2
scripts/azure-pipelines/azure-pipelines.yml
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
variables: variables:
linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-05-17' linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-06-07'
parameters: parameters:
- name: vcpkgToolSha - name: vcpkgToolSha