Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jfleisher/nightlynuget #5916

Merged
merged 23 commits into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
034f81c
WiP: Test nightly version number change
jfleisher Mar 11, 2022
dec4fd5
Fix debug assert
jfleisher Mar 15, 2022
aa527be
WiP: test nuget publish to AzDo feed for nightly build
jfleisher Mar 15, 2022
90773a9
WiP: Make Nuget deploy separate stage
jfleisher Mar 15, 2022
b3c92d7
WiP: fix nightly stage name
jfleisher Mar 15, 2022
cea4029
Merge branch 'master' into jfleisher/nightlynuget
jfleisher Mar 16, 2022
2d73dbd
change nuget push to vstsfeed
jfleisher Mar 16, 2022
7018910
Try case sensitive name for artifacts
jfleisher Mar 16, 2022
9c94481
Merge branch 'master' of https://github.com/Z3Prover/z3 into jfleishe…
jfleisher Mar 16, 2022
43263a0
WiP: use artifact folder names
jfleisher Mar 16, 2022
1bebe6e
add Rev version to package
jfleisher Mar 16, 2022
c4563a0
WiP: build def variation on nightly build version
jfleisher Mar 17, 2022
de585bf
WiP: use Build_BuildNumber and Build_DefinitionName
jfleisher Mar 17, 2022
65283aa
WiP: using hyphen in nightly version
jfleisher Mar 17, 2022
ceb1484
Tag nightly packages with datetime
jfleisher Mar 17, 2022
25d9667
fix commit
jfleisher Mar 17, 2022
502585b
Build.BuildId and Build.DefinitionName
jfleisher Mar 17, 2022
3c5e96e
WiP: change suffix format to lead with alpha
jfleisher Mar 18, 2022
62867d5
test z3public feed publish
jfleisher Mar 18, 2022
e1077c6
revert public publish test
jfleisher Mar 18, 2022
58d4fc0
WiP: test build# versioning scheme
jfleisher Mar 18, 2022
8b8adee
WiP: another variant on version number for nightly
jfleisher Mar 21, 2022
933cfec
Merge branch 'master' into jfleisher/nightlynuget
NikolajBjorner Mar 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 58 additions & 9 deletions scripts/nightly.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
variables:
ReleaseVersion: '4.8.15'
Major: '4'
Minor: '8'
Patch: '15'
NightlyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildId)-$(Build.DefinitionName)
MacFlags: 'CXXFLAGS="-arch arm64 -arch x86_64" LINK_EXTRA_FLAGS="-arch arm64 -arch x86_64" SLINK_EXTRA_FLAGS="-arch arm64 -arch x86_64" FPMATH_ENABLED=False'

stages:
Expand Down Expand Up @@ -131,6 +134,8 @@ stages:
targetPath: $(Build.ArtifactStagingDirectory)
artifactName: 'Windows64'



- stage: Package
jobs:
- job: NuGet64
Expand Down Expand Up @@ -171,7 +176,7 @@ stages:
workingDirectory: $(Agent.TempDirectory)\package
arguments:
$(Agent.TempDirectory)\package
$(ReleaseVersion)
$(NightlyVersion)
$(Build.Repository.Uri)
$(Build.SourceBranchName)
$(Build.SourceVersion)
Expand All @@ -181,13 +186,17 @@ stages:
displayName: 'NuGet Pack Symbols'
inputs:
command: custom
arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out'
versioningScheme: byPrereleaseNumber
majorVersion: $(Major)
minorVersion: $(Minor)
patchVersion: $(Patch)
arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.sym.nuspec -Version $(NightlyVersion) -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out'
- task: EsrpCodeSigning@1
displayName: 'Sign Package'
inputs:
ConnectedServiceName: 'z3-esrp-signing-2'
FolderPath: $(Build.ArtifactStagingDirectory)
Pattern: Microsoft.Z3.$(ReleaseVersion).nupkg
Pattern: Microsoft.Z3.$(NightlyVersion).nupkg
signConfigType: 'inlineSignParams'
inlineOperation: |
[
Expand All @@ -214,7 +223,7 @@ stages:
inputs:
ConnectedServiceName: 'z3-esrp-signing-2'
FolderPath: $(Build.ArtifactStagingDirectory)
Pattern: Microsoft.Z3.$(ReleaseVersion).snupkg
Pattern: Microsoft.Z3.$(NightlyVersion).snupkg
signConfigType: 'inlineSignParams'
inlineOperation: |
[
Expand Down Expand Up @@ -269,7 +278,7 @@ stages:
workingDirectory: $(Agent.TempDirectory)\package
arguments:
$(Agent.TempDirectory)\package
$(ReleaseVersion)
$(NightlyVersion)
$(Build.Repository.Uri)
$(Build.SourceBranchName)
$(Build.SourceVersion)
Expand All @@ -280,13 +289,17 @@ stages:
displayName: 'NuGet Pack Symbols'
inputs:
command: custom
arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x86.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out'
versioningScheme: byPrereleaseNumber
majorVersion: $(Major)
minorVersion: $(Minor)
patchVersion: $(Patch)
arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x86.sym.nuspec -Version $(NightlyVersion) -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out'
- task: EsrpCodeSigning@1
displayName: 'Sign Package'
inputs:
ConnectedServiceName: 'z3-esrp-signing-2'
FolderPath: $(Build.ArtifactStagingDirectory)
Pattern: Microsoft.Z3.x86.$(ReleaseVersion).nupkg
Pattern: Microsoft.Z3.x86.$(NightlyVersion).nupkg
signConfigType: 'inlineSignParams'
inlineOperation: |
[
Expand All @@ -313,7 +326,7 @@ stages:
inputs:
ConnectedServiceName: 'z3-esrp-signing-2'
FolderPath: $(Build.ArtifactStagingDirectory)
Pattern: Microsoft.Z3.x86.$(ReleaseVersion).snupkg
Pattern: Microsoft.Z3.x86.$(NightlyVersion).snupkg
signConfigType: 'inlineSignParams'
inlineOperation: |
[
Expand Down Expand Up @@ -449,5 +462,41 @@ stages:
isDraft: false
isPreRelease: true

- stage: NugetPublishNightly
jobs:
# Publish to nightly feed on Azure
- job: NuGetPublishNightly
displayName: "Push nuget packages to Azure Feed"
steps:
- task: NuGetAuthenticate@0
displayName: 'NuGet Authenticate'
- task: NuGetToolInstaller@0
inputs:
versionSpec: 5.x
checkLatest: false
- task: DownloadPipelineArtifact@2
displayName: 'Download NuGet x86 Package'
inputs:
artifact: 'NuGet32'
path: $(Agent.TempDirectory)/x86
- task: DownloadPipelineArtifact@2
displayName: 'Download NuGet x64 Package'
inputs:
artifact: 'NuGet'
path: $(Agent.TempDirectory)/x64
- task: NuGetCommand@2
displayName: 'NuGet Nightly x64 push'
inputs:
command: push
publishVstsFeed: 'Z3Build/Z3-Nightly-builds'
packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg
allowPackageConflicts: true
- task: NuGetCommand@2
displayName: 'NuGet Nightly x86 push'
inputs:
command: push
publishVstsFeed: 'Z3Build/Z3-Nightly-builds'
packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg
allowPackageConflicts: true

# TBD: run regression tests on generated binaries.
2 changes: 1 addition & 1 deletion src/api/dotnet/NativeSolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ public override string ToString()

internal NativeSolver(NativeContext nativeCtx, Z3_solver z3solver)
{
Debug.Assert(nCtx != IntPtr.Zero);
Debug.Assert(nativeCtx != null);
jfleisher marked this conversation as resolved.
Show resolved Hide resolved
Debug.Assert(z3solver != IntPtr.Zero);

this.ntvContext = nativeCtx;
Expand Down