From 034f81c6d00893db09fbf925d25dd2c3427bab79 Mon Sep 17 00:00:00 2001 From: jfleisher Date: Fri, 11 Mar 2022 09:16:25 -0500 Subject: [PATCH 01/20] WiP: Test nightly version number change --- scripts/nightly.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index cccf55a3166..a0fbd43a2c6 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -1,5 +1,9 @@ variables: - ReleaseVersion: '4.8.15' + Major: '4' + Minor: '8' + Patch: '15' + Suffix: 'nightly' + NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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: @@ -171,7 +175,7 @@ stages: workingDirectory: $(Agent.TempDirectory)\package arguments: $(Agent.TempDirectory)\package - $(ReleaseVersion) + $(NightlyVersion) $(Build.Repository.Uri) $(Build.SourceBranchName) $(Build.SourceVersion) @@ -187,7 +191,7 @@ stages: inputs: ConnectedServiceName: 'z3-esrp-signing-2' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.$(ReleaseVersion).nupkg + Pattern: Microsoft.Z3.$(Major).$(Minor).$(Patch)-$(suffix).nupkg signConfigType: 'inlineSignParams' inlineOperation: | [ @@ -214,7 +218,7 @@ stages: inputs: ConnectedServiceName: 'z3-esrp-signing-2' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.$(ReleaseVersion).snupkg + Pattern: Microsoft.Z3.$(NightlyVersion).snupkg signConfigType: 'inlineSignParams' inlineOperation: | [ @@ -269,7 +273,7 @@ stages: workingDirectory: $(Agent.TempDirectory)\package arguments: $(Agent.TempDirectory)\package - $(ReleaseVersion) + $(NightlyVersion) $(Build.Repository.Uri) $(Build.SourceBranchName) $(Build.SourceVersion) @@ -286,7 +290,7 @@ stages: inputs: ConnectedServiceName: 'z3-esrp-signing-2' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.x86.$(ReleaseVersion).nupkg + Pattern: Microsoft.Z3.x86.$(NightlyVersion).nupkg signConfigType: 'inlineSignParams' inlineOperation: | [ @@ -313,7 +317,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: | [ From dec4fd53bf9b9479f1af01a0804c0bc3a1bf5f41 Mon Sep 17 00:00:00 2001 From: jfleisher Date: Tue, 15 Mar 2022 10:07:09 -0400 Subject: [PATCH 02/20] Fix debug assert --- src/api/dotnet/NativeSolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/dotnet/NativeSolver.cs b/src/api/dotnet/NativeSolver.cs index 40444804a05..7dc937234ad 100644 --- a/src/api/dotnet/NativeSolver.cs +++ b/src/api/dotnet/NativeSolver.cs @@ -405,7 +405,7 @@ public override string ToString() internal NativeSolver(NativeContext nativeCtx, Z3_solver z3solver) { - Debug.Assert(nCtx != IntPtr.Zero); + Debug.Assert(nativeCtx != null); Debug.Assert(z3solver != IntPtr.Zero); this.ntvContext = nativeCtx; From aa527be0aa25bfd3d09cebcb038b2930e37a5903 Mon Sep 17 00:00:00 2001 From: jofleish Date: Tue, 15 Mar 2022 14:29:17 -0400 Subject: [PATCH 03/20] WiP: test nuget publish to AzDo feed for nightly build --- scripts/nightly.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index a0fbd43a2c6..3eb60c205a7 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -453,5 +453,40 @@ stages: isDraft: false isPreRelease: true + # Publish to nightly feed on Azure + - job: NuGetPublishNightlyx64 + steps: + - task: NuGetAuthenticate@0 + displayName: 'NuGet Authenticate' + inputs: + nuGetServiceConnections: 'Z3-nightly nuget feed' + - task: NuGetToolInstaller@0 + inputs: + versionSpec: 5.x + checkLatest: false + - task: DownloadPipelineArtifact@2 + displayName: 'Download NuGet x64 Package' + inputs: + artifact: 'Nuget64' + path: $(Agent.TempDirectory)/x64 + - task: DownloadPipelineArtifact@2 + displayName: 'Download NuGet x86 Package' + inputs: + artifact: 'Nuget32' + path: $(Agent.TempDirectory)/x86 + - task: NuGetCommand@2 + displayName: 'NuGet Nightly x64 push' + inputs: + nuGetFeedType: External + packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg + command: push + allowPackageConflicts: true + - task: NuGetCommand@2 + displayName: 'NuGet Nightly x86 push' + inputs: + nuGetFeedType: External + packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg + command: push + allowPackageConflicts: true # TBD: run regression tests on generated binaries. From 90773a99222595f51b2a8a48cb04cb74449dcee5 Mon Sep 17 00:00:00 2001 From: jofleish Date: Tue, 15 Mar 2022 14:59:07 -0400 Subject: [PATCH 04/20] WiP: Make Nuget deploy separate stage --- scripts/nightly.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 3eb60c205a7..0ccef0705ea 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -453,8 +453,11 @@ stages: isDraft: false isPreRelease: true +- stage: Nuget publish nightly + jobs: # Publish to nightly feed on Azure - - job: NuGetPublishNightlyx64 + - job: NuGetPublishNightly + displayName: Push nuget packages to Azure Feed steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' From b3c92d7da02c25b4185fb68f1f18ddc79f540b6b Mon Sep 17 00:00:00 2001 From: jofleish Date: Tue, 15 Mar 2022 15:01:21 -0400 Subject: [PATCH 05/20] WiP: fix nightly stage name --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 0ccef0705ea..9a696653379 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -453,11 +453,11 @@ stages: isDraft: false isPreRelease: true -- stage: Nuget publish nightly +- stage: NugePublishNightly jobs: # Publish to nightly feed on Azure - job: NuGetPublishNightly - displayName: Push nuget packages to Azure Feed + displayName: "Push nuget packages to Azure Feed" steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' From 2d73dbdc8718cc9fcec9aa5a682a3e41055f5886 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 16 Mar 2022 08:30:03 -0400 Subject: [PATCH 06/20] change nuget push to vstsfeed --- scripts/nightly.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 9a696653379..8020072fdec 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -461,8 +461,6 @@ stages: steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' - inputs: - nuGetServiceConnections: 'Z3-nightly nuget feed' - task: NuGetToolInstaller@0 inputs: versionSpec: 5.x @@ -480,16 +478,16 @@ stages: - task: NuGetCommand@2 displayName: 'NuGet Nightly x64 push' inputs: - nuGetFeedType: External - packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg command: push + publishVstsFeed: 'Z3Build/Z3-Nightly-builds' + packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg allowPackageConflicts: true - task: NuGetCommand@2 displayName: 'NuGet Nightly x86 push' inputs: - nuGetFeedType: External - packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg command: push + publishVstsFeed: 'Z3Build/Z3-Nightly-builds' + packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg allowPackageConflicts: true # TBD: run regression tests on generated binaries. From 7018910b78f25fc9870d8b1aa852acb7b68ffc5b Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 16 Mar 2022 09:34:44 -0400 Subject: [PATCH 07/20] Try case sensitive name for artifacts --- scripts/nightly.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 8020072fdec..0ebdb633a57 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -453,7 +453,7 @@ stages: isDraft: false isPreRelease: true -- stage: NugePublishNightly +- stage: NugetPublishNightly jobs: # Publish to nightly feed on Azure - job: NuGetPublishNightly @@ -468,12 +468,12 @@ stages: - task: DownloadPipelineArtifact@2 displayName: 'Download NuGet x64 Package' inputs: - artifact: 'Nuget64' + artifact: 'NuGet64' path: $(Agent.TempDirectory)/x64 - task: DownloadPipelineArtifact@2 displayName: 'Download NuGet x86 Package' inputs: - artifact: 'Nuget32' + artifact: 'NuGet32' path: $(Agent.TempDirectory)/x86 - task: NuGetCommand@2 displayName: 'NuGet Nightly x64 push' From 43263a0d82a1f5442c7d91b2078db3202e2dd53c Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 16 Mar 2022 12:16:50 -0400 Subject: [PATCH 08/20] WiP: use artifact folder names --- scripts/nightly.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 0ebdb633a57..d13bbbfac0b 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -465,16 +465,16 @@ stages: inputs: versionSpec: 5.x checkLatest: false - - task: DownloadPipelineArtifact@2 - displayName: 'Download NuGet x64 Package' - inputs: - artifact: 'NuGet64' - path: $(Agent.TempDirectory)/x64 - 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: From 1bebe6e0e4444818f7f5074abf22fc43797a1f8a Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 16 Mar 2022 15:58:22 -0400 Subject: [PATCH 09/20] add Rev version to package --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index d13bbbfac0b..832860a791c 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -3,7 +3,7 @@ variables: Minor: '8' Patch: '15' Suffix: 'nightly' - NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) + NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix)+$(Rev:r) 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: From c4563a0113deb5c67d609e47410b2694a88b500e Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 17 Mar 2022 08:24:01 -0400 Subject: [PATCH 10/20] WiP: build def variation on nightly build version --- scripts/nightly.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 832860a791c..2db9fb19050 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,8 +2,8 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: 'nightly' - NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix)+$(Rev:r) + Suffix: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) + NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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: @@ -191,7 +191,7 @@ stages: inputs: ConnectedServiceName: 'z3-esrp-signing-2' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.$(Major).$(Minor).$(Patch)-$(suffix).nupkg + Pattern: Microsoft.Z3.$(NightlyVersion).nupkg signConfigType: 'inlineSignParams' inlineOperation: | [ From de585bf301213ebac0092d66cbe0da4164bc8088 Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 17 Mar 2022 09:45:40 -0400 Subject: [PATCH 11/20] WiP: use Build_BuildNumber and Build_DefinitionName --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 2db9fb19050..9e7aa9de8bb 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,8 +2,8 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) - NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) + Suffix: $(BUILD_BUILDNUMBER)-$(BUILD_DEFINITIONNAME) + NightlyVersion: $(Major).$(Minor).$(Patch).$(Suffix) 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: From 65283aaccdd34d744e244a8319ffe073a607c9af Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 17 Mar 2022 12:27:03 -0400 Subject: [PATCH 12/20] WiP: using hyphen in nightly version --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 9e7aa9de8bb..246a3933c79 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,8 +2,8 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(BUILD_BUILDNUMBER)-$(BUILD_DEFINITIONNAME) - NightlyVersion: $(Major).$(Minor).$(Patch).$(Suffix) + Suffix: ${BUILD_BUILDNUMBER}-${BUILD_DEFINITIONNAME} + NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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: From ceb148450d6cfb7a52616b59ffc4cf34aab3e8ee Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 17 Mar 2022 13:34:09 -0400 Subject: [PATCH 13/20] Tag nightly packages with datetime --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 246a3933c79..cbc44ff4638 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,7 +2,7 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: ${BUILD_BUILDNUMBER}-${BUILD_DEFINITIONNAME} + Suffix: $(Date:yyyyMMdd).$(Sectonds)-$(Build.DefinitionName) NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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' From 25d9667049d765539c92ac30ae5f3563535f40c1 Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 17 Mar 2022 13:34:59 -0400 Subject: [PATCH 14/20] fix commit --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index cbc44ff4638..8316dfbe96b 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,7 +2,7 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(Date:yyyyMMdd).$(Sectonds)-$(Build.DefinitionName) + Suffix: $(Date:yyyyMMdd).$(Seconds)-$(Build.DefinitionName) NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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' From 502585b0fb9928da430f0b5997ef0cc6b10e9040 Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 17 Mar 2022 15:33:10 -0400 Subject: [PATCH 15/20] Build.BuildId and Build.DefinitionName --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 8316dfbe96b..b8cff75c9d6 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,7 +2,7 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(Date:yyyyMMdd).$(Seconds)-$(Build.DefinitionName) + Suffix: $(Build.BuildId)_$(Build.DefinitionName) NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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' From 3c5e96e32af6789345b5d411a85e3cfbcc943f63 Mon Sep 17 00:00:00 2001 From: jofleish Date: Fri, 18 Mar 2022 09:18:19 -0400 Subject: [PATCH 16/20] WiP: change suffix format to lead with alpha --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index b8cff75c9d6..da69d4d7098 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,7 +2,7 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(Build.BuildId)_$(Build.DefinitionName) + Suffix: $(Build.DefinitionName)$(Build.BuildId) NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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' From 62867d57e6c18a910b989a0f226aa7cd6bd5c135 Mon Sep 17 00:00:00 2001 From: jofleish Date: Fri, 18 Mar 2022 09:23:56 -0400 Subject: [PATCH 17/20] test z3public feed publish --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index da69d4d7098..f768d4d247c 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -479,14 +479,14 @@ stages: displayName: 'NuGet Nightly x64 push' inputs: command: push - publishVstsFeed: 'Z3Build/Z3-Nightly-builds' + publishVstsFeed: 'Z3Public/Z3Public' packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg allowPackageConflicts: true - task: NuGetCommand@2 displayName: 'NuGet Nightly x86 push' inputs: command: push - publishVstsFeed: 'Z3Build/Z3-Nightly-builds' + publishVstsFeed: 'Z3Public/Z3Public' packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg allowPackageConflicts: true From e1077c62d7bd1973d2b5fb8ad3d37e5755995ffc Mon Sep 17 00:00:00 2001 From: jofleish Date: Fri, 18 Mar 2022 10:19:15 -0400 Subject: [PATCH 18/20] revert public publish test --- scripts/nightly.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index f768d4d247c..c5942529cd1 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,7 +2,7 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(Build.DefinitionName)$(Build.BuildId) + Suffix: $(Build.DefinitionName)_$(Build.BuildId) NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) 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' @@ -479,14 +479,14 @@ stages: displayName: 'NuGet Nightly x64 push' inputs: command: push - publishVstsFeed: 'Z3Public/Z3Public' + publishVstsFeed: 'Z3Build/Z3-Nightly-builds' packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg allowPackageConflicts: true - task: NuGetCommand@2 displayName: 'NuGet Nightly x86 push' inputs: command: push - publishVstsFeed: 'Z3Public/Z3Public' + publishVstsFeed: 'Z3Build/Z3-Nightly-builds' packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg allowPackageConflicts: true From 58d4fc03f2b42d706de220d4cfdd3eac40f3c76b Mon Sep 17 00:00:00 2001 From: jofleish Date: Fri, 18 Mar 2022 14:24:59 -0400 Subject: [PATCH 19/20] WiP: test build# versioning scheme --- scripts/nightly.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index c5942529cd1..0affca7aa76 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -2,8 +2,7 @@ variables: Major: '4' Minor: '8' Patch: '15' - Suffix: $(Build.DefinitionName)_$(Build.BuildId) - NightlyVersion: $(Major).$(Minor).$(Patch)-$(Suffix) + 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: @@ -185,6 +184,7 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom + versioningScheme: byBuildNumber arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' - task: EsrpCodeSigning@1 displayName: 'Sign Package' @@ -284,6 +284,7 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom + versioningScheme: byBuildNumber arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x86.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' - task: EsrpCodeSigning@1 displayName: 'Sign Package' From 8b8adee9d3aa080abe33be9041d9540222ce7af9 Mon Sep 17 00:00:00 2001 From: jofleish Date: Mon, 21 Mar 2022 15:48:44 -0400 Subject: [PATCH 20/20] WiP: another variant on version number for nightly --- scripts/nightly.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 0affca7aa76..b2f002781ab 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -134,6 +134,8 @@ stages: targetPath: $(Build.ArtifactStagingDirectory) artifactName: 'Windows64' + + - stage: Package jobs: - job: NuGet64 @@ -184,8 +186,11 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom - versioningScheme: byBuildNumber - 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: @@ -284,8 +289,11 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom - versioningScheme: byBuildNumber - 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: