Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI with android NDK r27c #40339

Merged
merged 18 commits into from
Oct 24, 2024
Merged
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/azure-pipelines/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
FROM ubuntu:focal-20240918

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-r26d-linux.zip /android-ndk-r26d-linux.zip
ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip

# Add apt packages

@@ -60,10 +60,10 @@ apt-get -y dist-upgrade
apt-get -y --no-install-recommends install $APT_PACKAGES

# Android NDK
unzip /android-ndk-r26d-linux.zip
rm -f android-ndk-r26d-linux.zip
unzip /android-ndk-r27c-linux.zip
rm -f android-ndk-r27c-linux.zip
END_OF_SCRIPT

ENV ANDROID_NDK_HOME /android-ndk-r26d
ENV ANDROID_NDK_HOME /android-ndk-r27c

WORKDIR /vcpkg
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/android/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- name: VCPKG_DOWNLOADS
value: /mnt/vcpkg-ci/downloads
- name: ANDROID_NDK_HOME
value: /android-ndk-r26d
value: /android-ndk-r27c
steps:
# Note: /mnt is the Azure machines' temporary disk.
- bash: |
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: MIT
#
variables:
linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-10-15'
linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-10-21'

parameters:
- name: vcpkgToolSha
@@ -12,7 +12,7 @@ parameters:
- name: tripletPattern
displayName: 'Enable triplets which contain this substring'
type: string
default: 'android'
default: '-'

jobs:
- template: windows/azure-pipelines.yml
13 changes: 0 additions & 13 deletions scripts/azure-pipelines/test-modified-ports.ps1
Original file line number Diff line number Diff line change
@@ -120,19 +120,6 @@ if ($IsWindows) {
rmdir empty
}

if ($IsLinux -and $Triplet -match 'android' -and $true)
{
$override_ndk = 'r27c'
$override_ndk_sha512 = 'af359cb4e8483c26f11486de2eecbdcfa978a8f9cecf76a52d4345a722392a404d625fc9f2dba0f55909d9f1fa87f754a26acca4834eea4ddcbd07593a782e4b'
Write-Host "Downloading Android NDK $override_ndk"
& "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=https://dl.google.com/android/repository/android-ndk-$override_ndk-linux.zip" @cachingArgs
Write-Host "Unpacking"
& unzip -q android-ndk-$override_ndk-linux.zip
$env:ANDROID_NDK_HOME = Join-Path $Pwd "android-ndk-$override_ndk"
$NoParentHashes = $true
$skipFailuresArg = @()
}

& "./vcpkg$executableExtension" x-ci-clean @commonArgs
$lastLastExitCode = $LASTEXITCODE
if ($lastLastExitCode -ne 0)