From e6e00d894fe2ebcfdb0be06558dba4b14d3e853d Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Thu, 21 Apr 2022 10:18:40 +0100
Subject: [PATCH] update nightly/release scripts to produce arm64 for what is
 tested

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 scripts/nightly.yaml |  2 +-
 scripts/release.yml  | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 0add769b9..fc70b0e85 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -29,7 +29,7 @@ stages:
     pool:
       vmImage: "macOS-latest"
     steps:
-    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64
+    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64 --nojava
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
     - task: PublishPipelineArtifact@1
diff --git a/scripts/release.yml b/scripts/release.yml
index cd860d177..7d355c3ea 100644
--- a/scripts/release.yml
+++ b/scripts/release.yml
@@ -43,6 +43,36 @@ stages:
         artifactName: 'macOSBuild'
         targetPath: $(Build.ArtifactStagingDirectory)
 
+  - job: MacBuildArm64
+    displayName: "macOS Build"
+    pool:
+      vmImage: "macOS-latest"
+    steps:
+    - task: PythonScript@0
+      displayName: Build
+      inputs:
+        scriptSource: 'filepath'
+        scriptPath: scripts/mk_unix_dist.py
+        arguments: --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --nojava --arch=arm64
+    - script: git clone https://github.com/z3prover/z3test z3test
+      displayName: 'Clone z3test'
+    - task: PythonScript@0
+      displayName: Test
+      inputs:
+        scriptSource: 'filepath'
+        scriptPath: z3test/scripts/test_benchmarks.py
+        arguments: build-dist/z3 z3test/regressions/smt2
+    - task: CopyFiles@2
+      inputs:
+        sourceFolder: dist
+        contents: '*.zip'
+        targetFolder: $(Build.ArtifactStagingDirectory)
+    - task: PublishPipelineArtifact@0
+      inputs:
+        artifactName: 'macOSBuildArm64'
+        targetPath: $(Build.ArtifactStagingDirectory)
+
+
   - job: UbuntuBuild
     displayName: "Ubuntu build"
     pool:
@@ -429,6 +459,11 @@ stages:
       inputs:
         artifact: 'macOSBuild'
         path: $(Agent.TempDirectory)
+    - task: DownloadPipelineArtifact@2
+      displayName: 'Download macOSArm64 Build'
+      inputs:
+        artifact: 'macOSBuildArm64'
+        path: $(Agent.TempDirectory)	
     - task: DownloadPipelineArtifact@2
       displayName: 'Download Win32 Build'
       inputs: