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.

Sign up for GitHub

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

Separate script to acquire SDK, limit CI #1

Merged
merged 3 commits into from
Aug 3, 2024
Merged

Separate script to acquire SDK, limit CI #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30731f5
Separate script to acquire SDK
dg0yt Jul 28, 2024
760bf48
Limit CI to android
dg0yt Jul 28, 2024
9785d29
Fixup
dg0yt Jul 28, 2024
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
19 changes: 19 additions & 0 deletions scripts/azure-pipelines/acquire-android-sdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
$JDKVersion = '17.0.2'
$ToolsVersion = '10406996_latest'

Write-Host "Downloading the JDK"
& "./vcpkg" x-download openjdk-$JDKVersion.tar.gz "--sha512=0bf168239a9a1738ad6368b8f931d072aeb122863ec39ea86dc0449837f06953ce18be87bab7e20fd2585299a680ea844ec419fa235da87dfdd7e37b73740a57" "--url=https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-${JDKVersion}_linux-x64_bin.tar.gz" @cachingArgs

Write-Host "Setting up the JDK in $env:JAVA_HOME"
$env:JAVA_HOME = Join-Path $Pwd "jdk-$JDKVersion"
& tar -xvf openjdk-$JDKVersion.tar.gz

Write-Host "Downloading the Android SDK"
& "./vcpkg" x-download sdk-commandlinetools-linux-$ToolsVersion.zip "--sha512=64b7d18ee7adeb1204eaa2978091e874dc9af9604796b64e1a185a11c15325657383fc9900e55e4590c8b8a2784b3881745d2f32daef1207e746c0ee41c2b72b" "--url=https://dl.google.com/android/repository/commandlinetools-linux-${ToolsVersion}.zip"

$env:ANDROID_HOME = Join-Path $Pwd "android-sdk"
Write-Host "Setting up the Android SDK in $env:ANDROID_HOME"
& unzip -q sdk-commandlinetools-linux-$ToolsVersion.zip -d android-sdk
# https://doc.qt.io/qt-6/android-getting-started.html
& bash -c 'yes | ./android-sdk/cmdline-tools/bin/sdkmanager "--sdk_root=$ANDROID_HOME" "platform-tools" "platforms;android-34" "build-tools;34.0.0"'
& ./android-sdk/cmdline-tools/bin/sdkmanager "--sdk_root=$env:ANDROID_HOME" --list_installed
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
- name: tripletPattern
displayName: 'Enable triplets which contain this substring'
type: string
default: '-'
default: 'android'

jobs:
- template: windows/azure-pipelines.yml
Expand Down
18 changes: 1 addition & 17 deletions scripts/azure-pipelines/test-modified-ports.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,23 +122,7 @@ if ($IsWindows) {

if ($IsLinux)
{
Write-Host "Downloading and setting up Java"
& "./vcpkg" x-download openjdk.tar.gz "--sha512=0bf168239a9a1738ad6368b8f931d072aeb122863ec39ea86dc0449837f06953ce18be87bab7e20fd2585299a680ea844ec419fa235da87dfdd7e37b73740a57" "--url=https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz" @cachingArgs
& tar -xvzf openjdk.tar.gz
$env:JAVA_HOME = Join-Path $Pwd "jdk-17.0.2"
Write-Host "Downloading Android SDK"
& "./vcpkg" x-download android-sdk.zip "--sha512=64b7d18ee7adeb1204eaa2978091e874dc9af9604796b64e1a185a11c15325657383fc9900e55e4590c8b8a2784b3881745d2f32daef1207e746c0ee41c2b72b" "--url=https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip"


Write-Host "Setting up SDK"
& unzip -q android-sdk.zip -d android-sdk
$env:ANDROID_SDK_ROOT = Join-Path $Pwd "android-sdk"
Move-Item -Path ./android-sdk/cmdline-tools/ -Destination ./android-sdk/tools
New-Item -Path ./android-sdk -Name cmdline-tools -ItemType directory
Move-Item -Path ./android-sdk/tools -Destination ./android-sdk/cmdline-tools
& bash -c 'yes | ./android-sdk/cmdline-tools/tools/bin/sdkmanager --licenses'

& ./android-sdk/cmdline-tools/tools/bin/sdkmanager "platforms;android-33"
. ./scripts/azure-pipelines/acquire-android-sdk.ps1
$NoParentHashes = $true
}

Expand Down