From 4051fbd8b2dcae33eec2d8a750858444feb81242 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Mon, 21 Oct 2019 11:19:28 -0700
Subject: [PATCH] update nuget packaging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
scripts/mk_nuget_task.py | 11 ++++-------
scripts/nightly.yaml | 13 ++++++++++++-
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index 4604b2bfc..9b2ce1bbc 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -100,9 +100,6 @@ Linux Dependencies:
with open("out/Microsoft.Z3.x64.nuspec", 'w') as f:
f.write(contents)
-def create_nuget_package():
- subprocess.call(["nuget", "pack"], cwd="out")
-
nuget_sign_input = """
{
"Version": "1.0.0",
@@ -143,13 +140,12 @@ nuget_sign_input = """
]
}"""
-def sign_nuget_package():
+def create_sign_input(release_version):
package_name = "Microsoft.Z3.x64.%s.nupkg" % release_version
input_file = "out/nuget_sign_input.json"
output_path = os.path.abspath("out").replace("\\","\\\\")
with open(input_file, 'w') as f:
f.write(nuget_sign_input % (output_path, output_path, release_version, release_version))
- subprocess.call(["EsrpClient.exe", "sign", "-a", "authorization.json", "-p", "policy.json", "-i", input_file, "-o", "out\\diagnostics.json"])
def main():
@@ -161,8 +157,9 @@ def main():
unpack(packages)
mk_targets()
create_nuget_spec(release_version, release_commit)
- create_nuget_package()
- sign_nuget_package(release_version)
+ create_sign_input(release_version)
+# create_nuget_package()
+# sign_nuget_package(release_version)
main()
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index d24a6bce2..fd41d0945 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -1,3 +1,6 @@
+variables:
+ z3Version: '4.8.7'
+
jobs:
- job: Mac
@@ -90,8 +93,16 @@ jobs:
targetPath: tmp
- script: |
cd scripts
- python mk_nuget_task.py ../tmp 4.8.7 3424ffa
+ python mk_nuget_task.py ../tmp $(z3Version) 3424ffa
cd ..
+ - task: NuGetCommand@2
+ inputs:
+ command: pack
+ basePath: scripts/out
+ - script: |
+ cd scripts
+ EsprClient.exe sign -a authorization.json -p policy.json -i out/nuget_sign_input.json -o out/diagnostics.json
+ cd ..
- job: Python
displayName: "Python packaging"