From 8273a20498077fa2dce79539c261d2c563b990ef Mon Sep 17 00:00:00 2001 From: jofleish Date: Tue, 22 Mar 2022 17:26:12 -0400 Subject: [PATCH 01/11] test publish to public project feed --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index f412c41f9..a77d4a90b 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -489,14 +489,14 @@ stages: displayName: 'NuGet Nightly x64 push' inputs: command: push - publishVstsFeed: 'Z3Build/Z3-Nightly-builds' + publishVstsFeed: 'Z3 Public Nuget/Z3-Public-Nightly' packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg allowPackageConflicts: true - task: NuGetCommand@2 displayName: 'NuGet Nightly x86 push' inputs: command: push - publishVstsFeed: 'Z3Build/Z3-Nightly-builds' + publishVstsFeed: 'Z3 Public Nuget/Z3-Public-Nightly' packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg allowPackageConflicts: true From 7bf2df1b7afe4f3fb4e6dbbd6783ec67a8381694 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 08:44:42 -0400 Subject: [PATCH 02/11] Update nightly nuget service connection --- scripts/nightly.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index a77d4a90b..5be572a6a 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -3,7 +3,7 @@ variables: Major: '4' Minor: '8' Patch: '16' - NightlyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildId)-$(Build.DefinitionName) + NightlyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildNumber)-$(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: @@ -471,6 +471,7 @@ stages: steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' + inputs: 'Z3-nightly public nuget feed' - task: NuGetToolInstaller@0 inputs: versionSpec: 5.x From 16f47954c073432895947eeee4c59f9a861cc312 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 08:50:14 -0400 Subject: [PATCH 03/11] Use camel case service name --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 5be572a6a..e0b7d1bb7 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -471,7 +471,7 @@ stages: steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' - inputs: 'Z3-nightly public nuget feed' + inputs: Z3NightlyNuget - task: NuGetToolInstaller@0 inputs: versionSpec: 5.x From 13a33a3966b364a455aacbdac3e94e25baa2dd79 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 08:51:20 -0400 Subject: [PATCH 04/11] fix authentication input --- scripts/nightly.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index e0b7d1bb7..2bd47f9ba 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -471,7 +471,8 @@ stages: steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' - inputs: Z3NightlyNuget + inputs: + nuGetServiceConnections: Z3NightlyNuget - task: NuGetToolInstaller@0 inputs: versionSpec: 5.x From d9e93d5f7cd45923a7fdb429f35712dbb96d826e Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 09:53:15 -0400 Subject: [PATCH 05/11] revert to buildid in version number --- scripts/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 2bd47f9ba..a4c8cd5af 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -3,7 +3,7 @@ variables: Major: '4' Minor: '8' Patch: '16' - NightlyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildNumber)-$(Build.DefinitionName) + 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: From 1ee3de540934a5c47a7ed72a7eca3de1b008f280 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 12:25:31 -0400 Subject: [PATCH 06/11] temporary workaround for build --- scripts/nightly.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index a4c8cd5af..4ec6fbe8c 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -439,19 +439,19 @@ stages: inputs: artifactName: 'NuGet32' targetPath: tmp - - task: GitHubRelease@0 - inputs: - gitHubConnection: Z3GitHub - repositoryName: 'Z3Prover/z3' - action: 'delete' -# target: '$(Build.SourceVersion)' - tagSource: 'manual' - tag: 'Nightly' - - task: GitHubRelease@0 - inputs: - gitHubConnection: Z3GitHub - repositoryName: 'Z3Prover/z3' - action: 'create' +# - task: GitHubRelease@0 +# inputs: +# gitHubConnection: Z3GitHub +# repositoryName: 'Z3Prover/z3' +# action: 'delete' +# # target: '$(Build.SourceVersion)' +# tagSource: 'manual' +# tag: 'Nightly' +# - task: GitHubRelease@0 +# inputs: +# gitHubConnection: Z3GitHub +# repositoryName: 'Z3Prover/z3' +# action: 'create' # target: '$(Build.SourceVersion)' tagSource: 'manual' tag: 'Nightly' From 3ffc3c2f9786b96667dd4b700d839eacc49051d9 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 12:30:52 -0400 Subject: [PATCH 07/11] continue on github tagging error --- scripts/nightly.yaml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 4ec6fbe8c..12a9f68a3 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -439,19 +439,20 @@ stages: inputs: artifactName: 'NuGet32' targetPath: tmp -# - task: GitHubRelease@0 -# inputs: -# gitHubConnection: Z3GitHub -# repositoryName: 'Z3Prover/z3' -# action: 'delete' -# # target: '$(Build.SourceVersion)' -# tagSource: 'manual' -# tag: 'Nightly' -# - task: GitHubRelease@0 -# inputs: -# gitHubConnection: Z3GitHub -# repositoryName: 'Z3Prover/z3' -# action: 'create' + - task: GitHubRelease@0 + inputs: + gitHubConnection: Z3GitHub + repositoryName: 'Z3Prover/z3' + action: 'delete' +# target: '$(Build.SourceVersion)' + tagSource: 'manual' + tag: 'Nightly' + continueOnError: true + - task: GitHubRelease@0 + inputs: + gitHubConnection: Z3GitHub + repositoryName: 'Z3Prover/z3' + action: 'create' # target: '$(Build.SourceVersion)' tagSource: 'manual' tag: 'Nightly' @@ -462,6 +463,7 @@ stages: assetUploadMode: 'replace' isDraft: false isPreRelease: true + continueOnError: true - stage: NugetPublishNightly jobs: From b8c61ca27811ffed8553f44cafb09db645ae688a Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 12:31:35 -0400 Subject: [PATCH 08/11] continue on error in deploy --- scripts/nightly.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 12a9f68a3..e7730182a 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -396,6 +396,7 @@ stages: jobs: - job: Deploy displayName: "Deploy into GitHub" + continueOnError: true pool: vmImage: "ubuntu-latest" steps: From bb4a2b97b67abdafe73c89af354e90cc2bbd7565 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 14:28:43 -0400 Subject: [PATCH 09/11] remove project from public/org level feed --- scripts/nightly.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index e7730182a..dca77a731 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -474,8 +474,6 @@ stages: steps: - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate' - inputs: - nuGetServiceConnections: Z3NightlyNuget - task: NuGetToolInstaller@0 inputs: versionSpec: 5.x @@ -494,14 +492,14 @@ stages: displayName: 'NuGet Nightly x64 push' inputs: command: push - publishVstsFeed: 'Z3 Public Nuget/Z3-Public-Nightly' + publishVstsFeed: 'Z3-Public-Nightly' packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg allowPackageConflicts: true - task: NuGetCommand@2 displayName: 'NuGet Nightly x86 push' inputs: command: push - publishVstsFeed: 'Z3 Public Nuget/Z3-Public-Nightly' + publishVstsFeed: 'Z3-Public-Nightly' packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg allowPackageConflicts: true From a4af26e2f02fe274882f750b5871811db67446a9 Mon Sep 17 00:00:00 2001 From: jofleish Date: Wed, 23 Mar 2022 16:25:34 -0400 Subject: [PATCH 10/11] Shorten public feed to Z3Nightly --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index dca77a731..5998525dc 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -492,14 +492,14 @@ stages: displayName: 'NuGet Nightly x64 push' inputs: command: push - publishVstsFeed: 'Z3-Public-Nightly' + publishVstsFeed: 'Z3Nightly' packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg allowPackageConflicts: true - task: NuGetCommand@2 displayName: 'NuGet Nightly x86 push' inputs: command: push - publishVstsFeed: 'Z3-Public-Nightly' + publishVstsFeed: 'Z3Nightly' packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg allowPackageConflicts: true From 42da9760f904784c964c2fc2e7f503634105073e Mon Sep 17 00:00:00 2001 From: jofleish Date: Thu, 24 Mar 2022 12:35:10 -0400 Subject: [PATCH 11/11] Continue on error in GitHub tagging --- scripts/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 5998525dc..ab59ee004 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -441,6 +441,7 @@ stages: artifactName: 'NuGet32' targetPath: tmp - task: GitHubRelease@0 + continueOnError: true inputs: gitHubConnection: Z3GitHub repositoryName: 'Z3Prover/z3' @@ -448,8 +449,8 @@ stages: # target: '$(Build.SourceVersion)' tagSource: 'manual' tag: 'Nightly' - continueOnError: true - task: GitHubRelease@0 + continueOnError: true inputs: gitHubConnection: Z3GitHub repositoryName: 'Z3Prover/z3' @@ -464,7 +465,6 @@ stages: assetUploadMode: 'replace' isDraft: false isPreRelease: true - continueOnError: true - stage: NugetPublishNightly jobs: