From 4b3d78516e7e858eb419fd8c661894ae999846b7 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Tue, 26 Mar 2024 15:58:41 +0100 Subject: [PATCH 1/3] Restrict cmake on Android build New cmake fails to be imported in our Android environment --- .github/workflows/android_arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android_arm64.yml b/.github/workflows/android_arm64.yml index dd8d805261b043..cae667ea098ef5 100644 --- a/.github/workflows/android_arm64.yml +++ b/.github/workflows/android_arm64.yml @@ -116,7 +116,7 @@ jobs: apt --assume-yes install ccache scons ninja-build build-essential python3-pip # vcpkg requires cmake 3.19 or later - python3 -m pip install -U pip cmake + python3 -m pip install -U pip cmake<3.29.0 # vcpkg's tool dependencies apt --assume-yes install curl zip unzip tar # vcpkg 'python3' port dependencies From bd5da1f66d6b82a44415a59e7a3fcc78f25deeb2 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Tue, 26 Mar 2024 16:12:19 +0100 Subject: [PATCH 2/3] Update android_arm64.yml --- .github/workflows/android_arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android_arm64.yml b/.github/workflows/android_arm64.yml index cae667ea098ef5..9009740e73ceb3 100644 --- a/.github/workflows/android_arm64.yml +++ b/.github/workflows/android_arm64.yml @@ -116,7 +116,7 @@ jobs: apt --assume-yes install ccache scons ninja-build build-essential python3-pip # vcpkg requires cmake 3.19 or later - python3 -m pip install -U pip cmake<3.29.0 + python3 -m pip install -U pip cmake==3.28.4 # vcpkg's tool dependencies apt --assume-yes install curl zip unzip tar # vcpkg 'python3' port dependencies From c2acc25200315001f8a028f2c802288efe833398 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Tue, 26 Mar 2024 16:31:33 +0100 Subject: [PATCH 3/3] Update .github/workflows/android_arm64.yml Co-authored-by: Mikhail Ryzhov --- .github/workflows/android_arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android_arm64.yml b/.github/workflows/android_arm64.yml index 9009740e73ceb3..9c7b1cf8b5cb1f 100644 --- a/.github/workflows/android_arm64.yml +++ b/.github/workflows/android_arm64.yml @@ -116,7 +116,7 @@ jobs: apt --assume-yes install ccache scons ninja-build build-essential python3-pip # vcpkg requires cmake 3.19 or later - python3 -m pip install -U pip cmake==3.28.4 + python3 -m pip install -U pip cmake~=3.28.0 # vcpkg's tool dependencies apt --assume-yes install curl zip unzip tar # vcpkg 'python3' port dependencies