update release scripts

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
Z3Prover · Jan 30, 2024 · 67e5ba9 · 67e5ba9
1 parent f811801
commit 67e5ba9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/scripts/build-win-signed.yml b/scripts/build-win-signed.yml
@@ -19,7 +19,7 @@ jobs:
     inputs:
       script:
          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{parameters.BuildArchitecture}} &&
-        python scripts\mk_win_dist.py
+        python scripts\mk_win_dist_cmake.py
             --${{parameters.BuildArchitecture}}-only
             --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk
   - task: CopyFiles@2
@@ -42,7 +42,7 @@ jobs:
     displayName: Sign
     inputs:
       ConnectedServiceName: 'z3-esrp-signing-2'
-      FolderPath: 'dist/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win/bin'
+      FolderPath: 'dist/${{parameters.BuildArchitecture}}/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win/bin'
       Pattern: 'Microsoft.Z3.dll,libz3.dll,libz3java.dll,z3.exe'
       signConfigType: 'inlineSignParams'
       inlineOperation: |
@@ -82,12 +82,12 @@ jobs:
   - task: DeleteFiles@1
     displayName: Cleanup
     inputs:
-      SourceFolder: 'dist/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win/bin'
+      SourceFolder: 'dist/${{parameters.BuildArchitecture}}/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win/bin'
       Contents: 'CodeSignSummary*'
   - task: ArchiveFiles@2
     displayName: Zip
     inputs:
-      rootFolderOrFile: 'dist/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win'
+      rootFolderOrFile: 'dist/${{parameters.BuildArchitecture}}/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win'
       includeRootFolder: true
       archiveType: 'zip'
       archiveFile: '$(Build.ArtifactStagingDirectory)/z3-${{parameters.ReleaseVersion}}-${{parameters.BuildArchitecture}}-win.zip'

diff --git a/scripts/release.yml b/scripts/release.yml
@@ -209,6 +209,11 @@ stages:
       ReleaseVersion: $(ReleaseVersion)
       BuildArchitecture: 'x86'
 
+  - template: build-win-signed.yml
+    parameters:
+      ReleaseVersion: $(ReleaseVersion)
+      BuildArchitecture: 'arm64'
+
 
 # Creates Z3 packages in various formats
 - stage: Package
@@ -526,14 +531,19 @@ stages:
         artifact: 'WindowsBuild-x86'
         path: $(Agent.TempDirectory)
     - task: DownloadPipelineArtifact@2
-      displayName: "Download Python"
+      displayName: 'Download Win64 Build'
       inputs:
-        artifactName: 'PythonPackage'
+        artifact: 'WindowsBuild-x64'
         path: $(Agent.TempDirectory)
     - task: DownloadPipelineArtifact@2
-      displayName: 'Download Win64 Build'
+      displayName: 'Download Arm64 Build'
       inputs:
-        artifact: 'WindowsBuild-x64'
+        artifact: 'WindowsBuild-arm64'
+        path: $(Agent.TempDirectory)	
+    - task: DownloadPipelineArtifact@2
+      displayName: "Download Python"
+      inputs:
+        artifactName: 'PythonPackage'
         path: $(Agent.TempDirectory)
     - task: DownloadPipelineArtifact@2
       displayName: 'Download NuGet64 Package'