organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-21272 Add Windows ARM64 Debug build to CI build configuration.

Browse source
This commit is contained in:
Jeff Genovy 2020-09-09 13:19:57 -07:00
parent 18c4a69f80
commit 9a220a7381
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.ci-builds/.azure-pipelines.yml
View file

@ -216,9 +216,9 @@ jobs:
PathtoPublish: 'icu4c/source/dist/icu-windows.zip'
ArtifactName: '$(Build.BuildNumber)_ICU4C_MSVC_ARM64_Release'
#-------------------------------------------------------------------------
- job: ICU4C_MSVC_x64_Debug
displayName: 'C: MSVC 64-bit Debug (VS 2019)'
timeoutInMinutes: 30
- job: ICU4C_MSVC_x64_ARM64_Debug
displayName: 'C: MSVC x64 ARM64 Debug (VS 2019)'
timeoutInMinutes: 45
pool:
vmImage: 'windows-2019'
demands:
@ -236,10 +236,16 @@ jobs:
platform: x64
configuration: Debug
- task: BatchScript@1
displayName: 'Run Tests (icucheck.bat)'
displayName: 'Run x64 Debug Tests (icucheck.bat)'
inputs:
filename: icu4c/source/allinone/icucheck.bat
arguments: 'x64 Debug'
- task: VSBuild@1
displayName: 'Build ARM64 Debug'
inputs:
solution: icu4c/source/allinone/allinone.sln
platform: ARM64
configuration: Debug
#-------------------------------------------------------------------------
# VS 2017 Builds
#-------------------------------------------------------------------------

6
icu4c/source/data/makedata.mak
View file

@ -161,9 +161,11 @@ ARM_CROSSBUILD_TS=$(ICUTMP)\$(ARM_CROSS_BUILD).timestamp
#
# TOOLS CFG PATH
# Generally the tools want to run on the same architecture as is being built.
# Thus ARM and ARM64 need to use another build of the other tools, so make sure to get an usable cfg path.
# Thus ARM and ARM64 need to use another build of the other tools, so make sure to get an usable CFG path.
# Since tools, particularly pkggen, have architecture built-in, we made x64 on
# Windows be machine-independent and use those tools.
# Windows be machine-independent and use those tools for both ARM and ARM64.
# Note: If we're building ARM/ARM64 Debug, then we'll use the x64 Debug tools.
# If we're building ARM/ARM64 Release, then we'll use the x64 Release tools.
#
!IF "$(ARM_CROSS_BUILD)" == ""
CFGTOOLS=$(CFG)