From: Jeff Genovy <jefgen@microsoft.com>
Date: Tue, 17 Sep 2019 01:20:13 +0000 (-0700)
Subject: ICU-20825 Add ARM64 to distrelease.ps1 script, and run in the CI builds
X-Git-Tag: release-65-1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e472e46a60f5634ad224065cb87c6dbaf46e74c4;p=icu

ICU-20825 Add ARM64 to distrelease.ps1 script, and run in the CI builds
---

diff --git a/.ci-builds/.azure-pipelines.yml b/.ci-builds/.azure-pipelines.yml
index 31c0cb4eee8..16548aa64d4 100644
--- a/.ci-builds/.azure-pipelines.yml
+++ b/.ci-builds/.azure-pipelines.yml
@@ -126,8 +126,8 @@ jobs:
         PathtoPublish: 'icu4c/source/dist/icu-windows.zip'
         ArtifactName: '$(Build.BuildNumber)_ICU4C_MSVC_x86_Release'
 #-------------------------------------------------------------------------
-- job: ICU4C_MSVC_x64_ARM32_ARM64_Release
-  displayName: 'C: MSVC x64 ARM32 ARM64 Release (VS 2017)'
+- job: ICU4C_MSVC_x64_ARM32_ARM64_Release_Distrelease
+  displayName: 'C: MSVC x64 ARM32 ARM64 Release (VS 2017) + Distrelease ARM64'
   timeoutInMinutes: 60
   pool:
     vmImage: 'vs2017-win2016'
@@ -154,6 +154,18 @@ jobs:
         solution: icu4c/source/allinone/allinone.sln
         platform: ARM64
         configuration: Release
+    - task: PowerShell@2
+      displayName: 'PowerShell: Distrelease script (ARM64)'
+      inputs:
+        targetType: filePath
+        filePath: 'icu4c/packaging/distrelease.ps1'
+        arguments: '-arch ARM64'
+        workingDirectory: icu4c
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish ARM64 Artifacts: icu-windows.zip'
+      inputs:
+        PathtoPublish: 'icu4c/source/dist/icu-windows.zip'
+        ArtifactName: '$(Build.BuildNumber)_ICU4C_MSVC_ARM64_Release'
 #-------------------------------------------------------------------------
 - job: ICU4C_MSVC_x64_Release_DataFilter
   displayName: 'C: MSVC 64-bit Release DataFilter (VS 2017)'
diff --git a/icu4c/packaging/distrelease.ps1 b/icu4c/packaging/distrelease.ps1
index c8483fada32..d907cefbd32 100644
--- a/icu4c/packaging/distrelease.ps1
+++ b/icu4c/packaging/distrelease.ps1
@@ -13,7 +13,7 @@
 #  (bring up Powershell ISE)
 #    cd C:\icu\icu4c\
 #    Set-ExecutionPolicy -Scope Process Unrestricted
-#    .\packaging\distrelease.ps1 -arch "x64 or x86"
+#    .\packaging\distrelease.ps1 -arch "x64 or x86 or ARM64"
 #
 # Will emit: c:\icu4c\icu\source\dist\icu-windows.zip
 #
@@ -48,6 +48,11 @@ elseif ($arch -eq "x86")
     Copy-Item -Path "$icuDir\lib" -Destination $source -Recurse
     Copy-Item -Path "$icuDir\bin" -Destination $source -Recurse
 }
+elseif ($arch -eq "ARM64")
+{
+    Copy-Item -Path "$icuDir\libARM64" -Destination $source -Recurse
+    Copy-Item -Path "$icuDir\binARM64" -Destination $source -Recurse
+}
 else
 {
     $filename = $MyInvocation.MyCommand.Name;