8000 Deactivate windows arm64 build because of issued icu dependency · VXAPPS/sqlite_functions@3f06170 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3f06170

Browse files
florianbeckerflorianbecker
committed
Deactivate windows arm64 build because of issued icu dependency
1 parent e3afe42 commit 3f06170

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎.github/workflows/windows.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
name: [
1818
windows-2019-msvc2019,
1919
windows-2019-msvc2019-win32,
20-
windows-2019-msvc2019-arm64,
20+
# windows-2019-msvc2019-arm64,
2121
# windows-2019-msvc2019-clang,
2222
windows-2022-msvc2022,
23-
windows-2022-msvc2022-win32,
24-
windows-2022-msvc2022-arm64
23+
windows-2022-msvc2022-win32
24+
# windows-2022-msvc2022-arm64
2525
# windows-2022-msvc2022-clang
2626
]
2727
config: [Debug, Release]
@@ -37,11 +37,11 @@ jobs:
3737
version: Visual Studio 16 2019
3838
architecture: -A Win32
3939

40-
- name: windows-2019-msvc2019-arm64
41-
os: windows-2019
42-
compiler: cl
43-
version: Visual Studio 16 2019
44-
architecture: -A ARM64
40+
# - name: windows-2019-msvc2019-arm64
41+
# os: windows-2019
42+
# compiler: cl
43+
# version: Visual Studio 16 2019
44+
# architecture: -A ARM64
4545

4646
# clang-tools are not installed
4747
# - name: windows-2019-msvc2019-clang
@@ -61,11 +61,11 @@ jobs:
6161
version: Visual Studio 17 2022
6262
architecture: -A Win32
6363

64-
- name: windows-2022-msvc2022-arm64
65-
os: windows-2022
66-
compiler: cl
67-
version: Visual Studio 17 2022
68-
architecture: -A ARM64
64+
# - name: windows-2022-msvc2022-arm64
65+
# os: windows-2022
66+
# compiler: cl
67+
# version: Visual Studio 17 2022
68+
# architecture: -A ARM64
6969

7070
# clang-tools are not installed
7171
# - name: windows-2022-msvc2022-clang

‎cmake/external/icu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if(WIN32)
7979
set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=Win32 /p:SkipUWP=true /m:${CPU_COUNT})
8080
else()
8181
get_filename_component(COMPILER_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
82-
if(COMPILER_ID MATCHES arm OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM64)
82+
if(COMPILER_ID MATCHES *arm64* OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM64)
8383
set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=ARM64 /p:SkipUWP=true /m:${CPU_COUNT})
8484
else()
8585
set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:SkipUWP=true /m:${CPU_COUNT})

0 commit comments

Comments
 (0)
0