diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-12 12:55:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 12:55:11 -0800 |
| commit | bf482a9b589f104c5a4b612df6dc1e0e0142c120 (patch) | |
| tree | 165d2413d1684defbcd922111b740cf72a42117c /scripts | |
| parent | fe4aedef4d5bb3be19226ce4b6741510e2270cc2 (diff) | |
| download | vcpkg-bf482a9b589f104c5a4b612df6dc1e0e0142c120.tar.gz vcpkg-bf482a9b589f104c5a4b612df6dc1e0e0142c120.zip | |
[ampl-mp] Update version, separate port ampl-asl and fix arm build (#14518)
* [ampl-asl] Separate port ampl-mp module asl to ampl-asl
* [ampl-mp] Update version, separate port ampl-asl and fix arm build
* update baseline
* [VMSS] Pre-install ampl-mp:x86-windows
* Update ports/ampl-asl/portfile.cmake
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/azure-pipelines/test-modified-ports.ps1 | 2 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 85d0c7029..bac16c595 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -108,7 +108,7 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` # WORKAROUND: the x86-windows flavors of these are needed for all cross-compilation, but they are not auto-installed.
# Install them so the CI succeeds:
if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp')) {
- .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows @commonArgs
+ .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows ampl-mp:x86-windows @commonArgs
} elseif ($Triplet -in @('x64-windows', 'x64-windows-static')) {
.\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 69f152589..e669898f0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -42,9 +42,6 @@ alac:arm-uwp=fail alac:x64-uwp=fail aliyun-oss-c-sdk:x64-linux=fail aliyun-oss-c-sdk:x64-osx=fail -ampl-mp:arm64-windows=fail -ampl-mp:arm-uwp=fail -ampl-mp:x64-uwp=fail amqpcpp:arm-uwp=fail amqpcpp:x64-uwp=fail angelscript:arm64-windows=fail |