From 24f4cc689f63a4ebad8ed3d169270f690c16e6de Mon Sep 17 00:00:00 2001 From: Luca <681992+lukka@users.noreply.github.com> Date: Mon, 16 Sep 2019 22:12:36 -0700 Subject: [PATCH 01/16] add azure-pipeline for x64, arm64, x86, arm --- .gitmodules | 4 ++ azure-devops/install_msvc_preview.ps1 | 68 +++++++++++++++++++++++++++ azure-devops/run_build.yml | 51 ++++++++++++++++++++ azure-pipelines.yml | 31 ++++++++---- vcpkg | 1 + vcpkg_windows.txt | 5 ++ 6 files changed, 150 insertions(+), 10 deletions(-) create mode 100644 .gitmodules create mode 100644 azure-devops/install_msvc_preview.ps1 create mode 100644 azure-devops/run_build.yml create mode 160000 vcpkg create mode 100644 vcpkg_windows.txt diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..915667ffe51 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "vcpkg"] + path = vcpkg + url = https://github.com/microsoft/vcpkg.git + fetchRecurseSubmodules = false \ No newline at end of file diff --git a/azure-devops/install_msvc_preview.ps1 b/azure-devops/install_msvc_preview.ps1 new file mode 100644 index 00000000000..2f0b5545cef --- /dev/null +++ b/azure-devops/install_msvc_preview.ps1 @@ -0,0 +1,68 @@ +$ErrorActionPreference = "Stop" + +Function InstallVS +{ + # Microsoft hosted agents do not have the required MSVC 14.23 for building MSVC STL. + # This step installs MSVC 14.23, only on Microsoft hosted agents. + + Param( + [String]$WorkLoads, + [String]$Sku, + [String]$VSBootstrapperURL) + $exitCode = -1 + try + { + Write-Host "Downloading bootstrapper ..." + [string]$bootstrapperExe = Join-Path ${env:Temp} ([System.IO.Path]::GetRandomFileName() + ".exe") + Invoke-WebRequest -Uri $VSBootstrapperURL -OutFile $bootstrapperExe + + $Arguments = ('/c', $bootstrapperExe, $WorkLoads, '--quiet', '--norestart', '--wait', '--nocache' ) + + Write-Host "Starting Install: $Arguments" + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru + $exitCode = $process.ExitCode + + if ($exitCode -eq 0 -or $exitCode -eq 3010) + { + Write-Host -Object 'Installation successful!' + } + else + { + Write-Host -Object "Non zero exit code returned by the installation process : $exitCode." + } + } + catch + { + Write-Host -Object "Failed to install Visual Studio!" + Write-Host -Object $_.Exception.Message + exit $exitCode + } + + exit $exitCode +} + +# Invalidate the standard installation of VS on the hosted agent. +Move-Item "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/" "C:/Program Files (x86)/Microsoft Visual Studio/2019/nouse/" -Verbose + +$WorkLoads = '--add Microsoft.VisualStudio.Component.UWP.VC.ARM64 ' + ` + '--add Microsoft.VisualStudio.Component.VC.CLI.Support ' + ` + '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre ' + ` + '--add Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest ' + ` + '--add Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest ' + ` + '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 ' + ` + '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ' + ` + '--add Microsoft.VisualStudio.Component.VC.Tools.ARM ' + ` + '--add Microsoft.VisualStudio.Component.Windows10SDK.18362 ' + +$ReleaseInPath = 'Preview' +$Sku = 'Enterprise' +$VSBootstrapperURL = 'https://aka.ms/vs/16/pre/vs_buildtools.exe' + +$ErrorActionPreference = 'Stop' + +# Install VS +$exitCode = InstallVS -WorkLoads $WorkLoads -Sku $Sku -VSBootstrapperURL $VSBootstrapperURL + +exit $exitCode \ No newline at end of file diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml new file mode 100644 index 00000000000..3e9d6693e1d --- /dev/null +++ b/azure-devops/run_build.yml @@ -0,0 +1,51 @@ +parameters: + targetPlatform: 'x64' + +jobs: +- job: vs2019_hosted_${{ parameters.targetPlatform }} + pool: + #name: Hosted Windows 2019 with VS2019 + name: STL + + variables: + vcpkgLocation: '$(Build.SourcesDirectory)/vcpkg' + vcpkgResponseFile: $(Build.SourcesDirectory)/vcpkg_windows.txt + steps: + - checkout: self + submodules: recursive + - task: BatchScript@1 + inputs: + filename: 'azure-devops/enforce-clang-format.cmd' + failOnStandardError: true + displayName: 'Enforce clang-format' + # Install VS 2019 preview on Microsoft Hosted Agents only. + - task: PowerShell@2 + displayName: 'Install MSVC preview' + condition: or(contains(variables['Agent.Name'], 'Azure Pipelines'), contains(variables['Agent.Name'], 'Hosted Agent')) + inputs: + targetType: filePath + filePath: $(Build.SourcesDirectory)/azure-devops/install_msvc_preview.ps1 + - task: CacheBeta@0 + displayName: Cache vcpkg + inputs: + key: $(vcpkgResponseFile) | $(Build.SourcesDirectory)/.git/modules/vcpkg/HEAD + path: '$(vcpkgLocation)' + - task: run-vcpkg@0 + displayName: 'Run vcpkg to install boost-build' + inputs: + vcpkgArguments: 'boost-build:x86-windows' + vcpkgDirectory: '$(vcpkgLocation)' + - task: run-vcpkg@0 + displayName: 'Run vcpkg' + inputs: + vcpkgArguments: '@$(vcpkgResponseFile)' + vcpkgDirectory: '$(vcpkgLocation)' + vcpkgTriplet: ${{ parameters.targetPlatform }}-windows + - task: run-cmake@0 + displayName: 'Run CMake with Ninja' + enabled: true + inputs: + cmakeListsTxtPath: 'CMakeSettings.json' + useVcpkgToolchainFile: true + configurationRegexFilter: '.*${{ parameters.targetPlatform }}.*' + buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c0ccde8d09e..331bcbf887e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,10 +1,21 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -pool: 'STL' - -steps: -- task: BatchScript@1 - inputs: - filename: 'azure-devops/enforce-clang-format.cmd' - failOnStandardError: true - displayName: 'Enforce clang-format' +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +# Build STL targeting x64, arm64, x86, arm. + +jobs: +- template: azure-devops/run_build.yml + parameters: + targetPlatform: x64 + +- template: azure-devops/run_build.yml + parameters: + targetPlatform: arm64 + +- template: azure-devops/run_build.yml + parameters: + targetPlatform: x86 + +- template: azure-devops/run_build.yml + parameters: + targetPlatform: arm diff --git a/vcpkg b/vcpkg new file mode 160000 index 00000000000..8413b901d71 --- /dev/null +++ b/vcpkg @@ -0,0 +1 @@ +Subproject commit 8413b901d71ad2a1807f3bcb4dedc0835efed541 diff --git a/vcpkg_windows.txt b/vcpkg_windows.txt new file mode 100644 index 00000000000..0d2a4c51595 --- /dev/null +++ b/vcpkg_windows.txt @@ -0,0 +1,5 @@ +boost-build:x86-windows +boost-math:x64-windows +boost-math:x86-windows +boost-math:arm-windows +boost-math:arm64-windows \ No newline at end of file From 56e7e25e9efb7f5bc67fa9f8350f9d6496fb48f9 Mon Sep 17 00:00:00 2001 From: Luca <681992+lukka@users.noreply.github.com> Date: Tue, 24 Sep 2019 20:19:23 -0700 Subject: [PATCH 02/16] disable the git status command that is failing --- azure-devops/enforce-clang-format.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-devops/enforce-clang-format.cmd b/azure-devops/enforce-clang-format.cmd index e229c7ec398..2e59b338f03 100644 --- a/azure-devops/enforce-clang-format.cmd +++ b/azure-devops/enforce-clang-format.cmd @@ -3,4 +3,4 @@ @echo off clang-format -style=file -i stl/inc/* stl/inc/cvt/* stl/inc/experimental/* stl/src/* 2>&1 echo If your build fails here, you need to format the following files with clang-format 8.0.1. -git status --porcelain 1>&2 +rem git status --porcelain 1>&2 From 21b74334ab6ec3338b628469236d02e7096b212d Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:10:48 -0700 Subject: [PATCH 03/16] add /vcpkg/ to .gitignore. re-enable "git status" in enforce-clang-format.cmd --- .gitignore | 1 + azure-devops/enforce-clang-format.cmd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2dd12774b93..cb9e9d65781 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .vs/ .vscode/ /out/ +/vcpkg/ diff --git a/azure-devops/enforce-clang-format.cmd b/azure-devops/enforce-clang-format.cmd index 2e59b338f03..e229c7ec398 100644 --- a/azure-devops/enforce-clang-format.cmd +++ b/azure-devops/enforce-clang-format.cmd @@ -3,4 +3,4 @@ @echo off clang-format -style=file -i stl/inc/* stl/inc/cvt/* stl/inc/experimental/* stl/src/* 2>&1 echo If your build fails here, you need to format the following files with clang-format 8.0.1. -rem git status --porcelain 1>&2 +git status --porcelain 1>&2 From e041c7e1b7d58ecf38757d7ace75536ba69cf888 Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:14:06 -0700 Subject: [PATCH 04/16] add newline to .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 915667ffe51..e334d569546 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "vcpkg"] path = vcpkg url = https://github.com/microsoft/vcpkg.git - fetchRecurseSubmodules = false \ No newline at end of file + fetchRecurseSubmodules = false From 6106766450529fcd7a5e392d58b24fa3e6a357a2 Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:18:17 -0700 Subject: [PATCH 05/16] disable git-status in clang-format script --- azure-devops/enforce-clang-format.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-devops/enforce-clang-format.cmd b/azure-devops/enforce-clang-format.cmd index e229c7ec398..2e59b338f03 100644 --- a/azure-devops/enforce-clang-format.cmd +++ b/azure-devops/enforce-clang-format.cmd @@ -3,4 +3,4 @@ @echo off clang-format -style=file -i stl/inc/* stl/inc/cvt/* stl/inc/experimental/* stl/src/* 2>&1 echo If your build fails here, you need to format the following files with clang-format 8.0.1. -git status --porcelain 1>&2 +rem git status --porcelain 1>&2 From 3fa17d373a16eef3fde28009e5e6d94425560ec9 Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:33:37 -0700 Subject: [PATCH 06/16] remove useless workloads from VS installation script --- azure-devops/install_msvc_preview.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/azure-devops/install_msvc_preview.ps1 b/azure-devops/install_msvc_preview.ps1 index 2f0b5545cef..d7843480a5c 100644 --- a/azure-devops/install_msvc_preview.ps1 +++ b/azure-devops/install_msvc_preview.ps1 @@ -44,13 +44,10 @@ Function InstallVS # Invalidate the standard installation of VS on the hosted agent. Move-Item "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/" "C:/Program Files (x86)/Microsoft Visual Studio/2019/nouse/" -Verbose -$WorkLoads = '--add Microsoft.VisualStudio.Component.UWP.VC.ARM64 ' + ` - '--add Microsoft.VisualStudio.Component.VC.CLI.Support ' + ` +$WorkLoads = '--add Microsoft.VisualStudio.Component.VC.CLI.Support ' + ` '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre ' + ` - '--add Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest ' + ` - '--add Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest ' + ` '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 ' + ` '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ' + ` '--add Microsoft.VisualStudio.Component.VC.Tools.ARM ' + ` From e4b5b69b2191f93affb3797b5488dc31c1c5ab5b Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:34:42 -0700 Subject: [PATCH 07/16] name jobs as platform's name remove commented code in yml --- azure-devops/run_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml index 3e9d6693e1d..12ccabb17dc 100644 --- a/azure-devops/run_build.yml +++ b/azure-devops/run_build.yml @@ -2,9 +2,8 @@ parameters: targetPlatform: 'x64' jobs: -- job: vs2019_hosted_${{ parameters.targetPlatform }} +- job: ${{ parameters.targetPlatform }} pool: - #name: Hosted Windows 2019 with VS2019 name: STL variables: From 3adeea0b575ab4505dd81fe852f1efa4234a9db2 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 24 Sep 2019 21:50:25 -0700 Subject: [PATCH 08/16] Attempt to fix clang-format verification a different way. --- .gitignore | 1 - azure-devops/enforce-clang-format.cmd | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cb9e9d65781..2dd12774b93 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ .vs/ .vscode/ /out/ -/vcpkg/ diff --git a/azure-devops/enforce-clang-format.cmd b/azure-devops/enforce-clang-format.cmd index 2e59b338f03..d1f8e1f949a 100644 --- a/azure-devops/enforce-clang-format.cmd +++ b/azure-devops/enforce-clang-format.cmd @@ -3,4 +3,4 @@ @echo off clang-format -style=file -i stl/inc/* stl/inc/cvt/* stl/inc/experimental/* stl/src/* 2>&1 echo If your build fails here, you need to format the following files with clang-format 8.0.1. -rem git status --porcelain 1>&2 +git status --porcelain stl 1>&2 From 63d5a19a6a1ddaa3646e9ffa7dda5628846b91af Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 24 Sep 2019 21:55:23 -0700 Subject: [PATCH 09/16] Remove displayName part that doesn't seem to have any effect. --- azure-devops/run_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml index 12ccabb17dc..5f6c99049d3 100644 --- a/azure-devops/run_build.yml +++ b/azure-devops/run_build.yml @@ -16,7 +16,6 @@ jobs: inputs: filename: 'azure-devops/enforce-clang-format.cmd' failOnStandardError: true - displayName: 'Enforce clang-format' # Install VS 2019 preview on Microsoft Hosted Agents only. - task: PowerShell@2 displayName: 'Install MSVC preview' From eb8043565719525b3eab44707dfe6d669a87ddc4 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 24 Sep 2019 21:57:24 -0700 Subject: [PATCH 10/16] Attempt to only check clang-format on x86. --- azure-devops/run_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml index 5f6c99049d3..afbf3576359 100644 --- a/azure-devops/run_build.yml +++ b/azure-devops/run_build.yml @@ -13,6 +13,7 @@ jobs: - checkout: self submodules: recursive - task: BatchScript@1 + condition: eq('${{ parameters.targetPlatform }}', 'x86') inputs: filename: 'azure-devops/enforce-clang-format.cmd' failOnStandardError: true From 0464ce7775b98d907421eeb12fe4aeeffd19eda2 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 25 Sep 2019 12:31:11 -0700 Subject: [PATCH 11/16] Add displayName back. --- azure-devops/run_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml index afbf3576359..5f726de5a43 100644 --- a/azure-devops/run_build.yml +++ b/azure-devops/run_build.yml @@ -13,6 +13,7 @@ jobs: - checkout: self submodules: recursive - task: BatchScript@1 + displayName: 'Enforce clang-format' condition: eq('${{ parameters.targetPlatform }}', 'x86') inputs: filename: 'azure-devops/enforce-clang-format.cmd' From 44d4d316775dca2aee885c77b6fede45eb98d853 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 25 Sep 2019 15:28:41 -0700 Subject: [PATCH 12/16] Add newlines and license blocks, and remove Spectre libs. --- azure-devops/install_msvc_preview.ps1 | 13 ++++++------- azure-devops/run_build.yml | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/azure-devops/install_msvc_preview.ps1 b/azure-devops/install_msvc_preview.ps1 index d7843480a5c..076b0649bda 100644 --- a/azure-devops/install_msvc_preview.ps1 +++ b/azure-devops/install_msvc_preview.ps1 @@ -1,9 +1,11 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception $ErrorActionPreference = "Stop" Function InstallVS { - # Microsoft hosted agents do not have the required MSVC 14.23 for building MSVC STL. - # This step installs MSVC 14.23, only on Microsoft hosted agents. + # Microsoft hosted agents do not have the required MSVC Preview for building MSVC STL. + # This step installs MSVC Preview, only on Microsoft hosted agents. Param( [String]$WorkLoads, @@ -45,14 +47,11 @@ Function InstallVS Move-Item "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/" "C:/Program Files (x86)/Microsoft Visual Studio/2019/nouse/" -Verbose $WorkLoads = '--add Microsoft.VisualStudio.Component.VC.CLI.Support ' + ` - '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre ' + ` - '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre ' + ` - '--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 ' + ` '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ' + ` '--add Microsoft.VisualStudio.Component.VC.Tools.ARM ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.18362 ' - + $ReleaseInPath = 'Preview' $Sku = 'Enterprise' $VSBootstrapperURL = 'https://aka.ms/vs/16/pre/vs_buildtools.exe' @@ -62,4 +61,4 @@ $ErrorActionPreference = 'Stop' # Install VS $exitCode = InstallVS -WorkLoads $WorkLoads -Sku $Sku -VSBootstrapperURL $VSBootstrapperURL -exit $exitCode \ No newline at end of file +exit $exitCode diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml index 5f726de5a43..7df65b8fb3f 100644 --- a/azure-devops/run_build.yml +++ b/azure-devops/run_build.yml @@ -1,3 +1,5 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception parameters: targetPlatform: 'x64' From ab4391ff3112788fc8e15af2c1acb1fbf39f98d9 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 25 Sep 2019 15:29:46 -0700 Subject: [PATCH 13/16] Deindent install preview comment --- azure-devops/run_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-devops/run_build.yml b/azure-devops/run_build.yml index 7df65b8fb3f..a8379bb5eae 100644 --- a/azure-devops/run_build.yml +++ b/azure-devops/run_build.yml @@ -20,9 +20,9 @@ jobs: inputs: filename: 'azure-devops/enforce-clang-format.cmd' failOnStandardError: true - # Install VS 2019 preview on Microsoft Hosted Agents only. - task: PowerShell@2 displayName: 'Install MSVC preview' + # on "Hosted" agents only: condition: or(contains(variables['Agent.Name'], 'Azure Pipelines'), contains(variables['Agent.Name'], 'Hosted Agent')) inputs: targetType: filePath From 3a5d74e31621d9129ad94b50adcb41e1bb0969b7 Mon Sep 17 00:00:00 2001 From: Luca <681992+lukka@users.noreply.github.com> Date: Wed, 25 Sep 2019 16:22:17 -0700 Subject: [PATCH 14/16] cosmetic fixes --- azure-devops/install_msvc_preview.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-devops/install_msvc_preview.ps1 b/azure-devops/install_msvc_preview.ps1 index 076b0649bda..51f3f7c647b 100644 --- a/azure-devops/install_msvc_preview.ps1 +++ b/azure-devops/install_msvc_preview.ps1 @@ -18,7 +18,7 @@ Function InstallVS [string]$bootstrapperExe = Join-Path ${env:Temp} ([System.IO.Path]::GetRandomFileName() + ".exe") Invoke-WebRequest -Uri $VSBootstrapperURL -OutFile $bootstrapperExe - $Arguments = ('/c', $bootstrapperExe, $WorkLoads, '--quiet', '--norestart', '--wait', '--nocache' ) + $Arguments = ('/c', $bootstrapperExe, $WorkLoads, '--quiet', '--norestart', '--wait', '--nocache') Write-Host "Starting Install: $Arguments" $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru @@ -30,7 +30,7 @@ Function InstallVS } else { - Write-Host -Object "Non zero exit code returned by the installation process : $exitCode." + Write-Host -Object "Nonzero exit code returned by the installation process : $exitCode." } } catch From 87912e804bf21306fc642d8f9cc583ab99f50e68 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 25 Sep 2019 17:02:23 -0700 Subject: [PATCH 15/16] Reorder platforms and add license to .gitmodules. --- .gitmodules | 3 +++ azure-pipelines.yml | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e334d569546..00d25323985 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + [submodule "vcpkg"] path = vcpkg url = https://github.com/microsoft/vcpkg.git diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 331bcbf887e..dacfeda7170 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,21 +1,22 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -# Build STL targeting x64, arm64, x86, arm. +# Build STL targeting x86, x64, arm, arm64 jobs: - template: azure-devops/run_build.yml parameters: - targetPlatform: x64 + targetPlatform: x86 - template: azure-devops/run_build.yml parameters: - targetPlatform: arm64 + targetPlatform: x64 + - template: azure-devops/run_build.yml parameters: - targetPlatform: x86 + targetPlatform: arm - template: azure-devops/run_build.yml parameters: - targetPlatform: arm + targetPlatform: arm64 From f77752085502228ddab38a17abd5f0bced53c094 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 25 Sep 2019 19:07:01 -0700 Subject: [PATCH 16/16] Stephan's nitpicks --- azure-pipelines.yml | 1 - vcpkg_windows.txt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dacfeda7170..0ee01d6de5a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,6 @@ jobs: parameters: targetPlatform: x64 - - template: azure-devops/run_build.yml parameters: targetPlatform: arm diff --git a/vcpkg_windows.txt b/vcpkg_windows.txt index 0d2a4c51595..92889a0fe2a 100644 --- a/vcpkg_windows.txt +++ b/vcpkg_windows.txt @@ -1,5 +1,5 @@ boost-build:x86-windows -boost-math:x64-windows boost-math:x86-windows +boost-math:x64-windows boost-math:arm-windows -boost-math:arm64-windows \ No newline at end of file +boost-math:arm64-windows