aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-05-20 05:47:19 +0800
committerGitHub <noreply@github.com>2020-05-19 14:47:19 -0700
commitf23ebed76f0a6b13e2fe66f7a31ee744708d95b8 (patch)
tree7fb99351a9c54cef8027ab721c16c9998be21cca /scripts
parent9e03a3ac59797fcee9e0670d5e002b3a2a78ac44 (diff)
downloadvcpkg-f23ebed76f0a6b13e2fe66f7a31ee744708d95b8.tar.gz
vcpkg-f23ebed76f0a6b13e2fe66f7a31ee744708d95b8.zip
[cmake] Update to 3.17.2 (#10767)
* [cmake] Update to 3.17.1 * update cmake directory name * [cpuid] Fix install headers. * [stormlib] Fix install headers * [murmurhash] Fix install headers * [metrohash] Fix install headers * update baseline * update baseline * [otl] update hash * update baseline * [gts] Do not use ninja to avoid empty implib issue * update baseline * [dmlc] Re-trigger ci test * [replxx] Re-trigger ci test * update baseline * [osg] Re-trigger ci test * [replxx] Fix build failure * Set cmake min version to 3.17.1 * update baseline * [libnice] Re-trigger ci test * [mlpack] Re-trigger ci test * update to 3.17.2 * update cmake hash * update baseline * update baseline * update baseline * update baseline * Update scripts/ci.baseline.txt Co-authored-by: Billy O'Neal <billy.oneal@gmail.com> * update baseline * update baseline * [magnum] Set magnum:arm64-windows to skip in baseline * [nanogui] Set nanogui:arm64-windows to fail in baseline * [nettle] Set nettle:x64-windows to fail, waiting for fix this issue in another PR * re-trigger CI test * update baseline * Install unixODBC in Linux * [nanodbc] Re-trigger CI test * update baseline * Remove space * update baseline
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/azure-pipelines/linux/provision-image.sh3
-rw-r--r--scripts/ci.baseline.txt34
-rw-r--r--scripts/vcpkgTools.xml30
3 files changed, 29 insertions, 38 deletions
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
index 54e6c55ac..dc49426be 100755
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@@ -43,6 +43,9 @@ sudo apt update
sudo add-apt-repository universe
sudo apt install -y powershell
+# Install odbc
+sudo apt install -y unixodbc-dev
+
# Write SMB credentials
sudo mkdir /etc/smbcredentials
smbCredentialFile=/etc/smbcredentials/$StorageAccountName.cred
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 895cf3327..74bacad6c 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -69,7 +69,6 @@ ampl-mp:arm-uwp=fail
ampl-mp:x64-uwp=fail
angelscript:arm64-windows=fail
angelscript:arm-uwp=fail
-antlr4:arm64-windows=fail
antlr4:arm-uwp=fail
antlr4:x64-uwp=fail
anyrpc:arm-uwp=ignore
@@ -131,7 +130,6 @@ bde:x86-windows=fail
benchmark:arm64-windows=fail
benchmark:arm-uwp=fail
benchmark:x64-uwp=fail
-berkeleydb:arm64-windows=fail
berkeleydb:arm-uwp=fail
berkeleydb:x64-linux=fail
berkeleydb:x64-osx=fail
@@ -194,6 +192,7 @@ caf:arm64-windows=fail
caf:x64-uwp=fail
caf:x64-linux=ignore
caffe2:x86-windows=fail
+caffe2:arm64-windows=fail
cairomm:x64-linux=fail
capnproto:arm64-windows=fail
capnproto:arm-uwp=fail
@@ -243,6 +242,7 @@ civetweb:arm64-windows = skip
civetweb:arm-uwp = skip
civetweb:x64-uwp = skip
clapack:x64-uwp=fail
+clblas:arm64-windows=fail
clblast:x64-osx=ignore
clblast:x64-linux=fail
clblast:x64-windows-static=fail
@@ -268,7 +268,6 @@ coolprop:x64-uwp=fail
coroutine:arm-uwp=fail
coroutine:x64-linux=fail
coroutine:x64-uwp=fail
-corrade:arm64-windows=fail
corrade:arm-uwp=fail
corrade:x64-uwp=fail
cppcms:x64-linux=fail
@@ -316,7 +315,6 @@ cudnn:arm-uwp=fail
cudnn:x64-uwp=fail
cudnn:x64-windows-static=fail
cudnn:x86-windows=fail
-date:arm64-windows=fail
dbow2:x64-osx=fail
dcmtk:arm-uwp=fail
dcmtk:arm64-windows=fail
@@ -485,7 +483,6 @@ freerdp:arm64-windows=fail
freerdp:arm-uwp=fail
freerdp:x64-osx=fail
freerdp:x64-uwp=fail
-freetds:arm64-windows=fail
freetds:arm-uwp=fail
freetds:x64-linux=fail
freetds:x64-osx=fail
@@ -547,7 +544,6 @@ gl3w:arm64-windows=fail
gl3w:arm-uwp=fail
glew:arm64-windows=fail
glew:arm-uwp=fail
-glfw3:arm64-windows=fail
glfw3:arm-uwp=fail
glfw3:x64-uwp=fail
glib:x64-uwp=fail
@@ -571,7 +567,6 @@ gperf:arm-uwp=fail
gperftools:arm64-windows=fail
gperftools:x64-uwp=fail
gperftools:arm-uwp=fail
-graphicsmagick:arm64-windows=fail
graphicsmagick:arm-uwp=fail
graphicsmagick:x64-uwp=fail
graphite2:arm-uwp=fail
@@ -665,6 +660,7 @@ isal:x86-windows=fail
itk:x64-windows=fail
itk:x64-windows-static=fail
itk:x86-windows=fail
+itk:x64-osx=fail
ixwebsocket:x64-linux=ignore
jack2:arm-uwp=fail
jack2:x64-uwp=fail
@@ -679,7 +675,6 @@ jemalloc:x64-uwp=fail
jemalloc:x64-windows-static=fail
jinja2cpplight:arm-uwp=fail
jinja2cpplight:x64-uwp=fail
-keystone:arm64-windows=fail
keystone:arm-uwp=fail
keystone:x64-uwp=fail
kinectsdk1:arm64-windows=fail
@@ -698,13 +693,10 @@ lcm:x64-linux=fail
lcm:x64-osx=fail
leptonica:x64-uwp=fail
leptonica:arm-uwp=fail
-leptonica:arm64-windows=fail
leveldb:arm-uwp=fail
leveldb:x64-uwp=fail
libaiff:x64-linux=fail
-libarchive:arm64-windows=fail
libarchive:arm-uwp=fail
-libarchive:x64-uwp=fail
libass:x64-windows-static=fail
libb2:x86-windows=fail
libb2:x64-windows=fail
@@ -735,7 +727,6 @@ libdatrie:x64-linux=fail
libdatrie:x64-osx=fail
libdisasm:arm-uwp=fail
libdisasm:x64-uwp=fail
-libdshowcapture:arm64-windows=fail
libdshowcapture:arm-uwp=fail
libdshowcapture:x64-linux=fail
libdshowcapture:x64-osx=fail
@@ -762,7 +753,6 @@ libfabric:x64-uwp=fail
libfabric:x64-windows=ignore
libfreenect2:arm64-windows=fail
libgd:x64-linux=ignore
-libgit2:arm64-windows=fail
libgit2:arm-uwp=fail
libgit2:x64-uwp=fail
libgo:arm-uwp=fail
@@ -968,7 +958,6 @@ libusbmuxd:arm-uwp=fail
libusbmuxd:x64-uwp=fail
libusbmuxd:x64-linux=fail
libusbmuxd:x64-osx=fail
-libusb-win32:arm64-windows=fail
libusb-win32:arm-uwp=fail
libusb-win32:x64-linux=fail
libusb-win32:x64-osx=fail
@@ -983,7 +972,6 @@ libuuid:x64-uwp=fail
libuuid:x64-windows=fail
libuuid:x64-windows-static=fail
libuuid:x86-windows=fail
-libuv:arm64-windows=fail
libuv:arm-uwp=fail
libuv:x64-uwp=fail
libvmdk:arm-uwp=fail
@@ -1021,7 +1009,6 @@ llgl:x64-uwp=fail
llvm:arm-uwp=fail
llvm:arm64-windows=fail
llvm:x64-uwp=fail
-lmdb:arm64-windows=fail
lmdb:arm-uwp=fail
lmdb:x64-uwp=fail
log4cplus:arm-uwp=fail
@@ -1045,6 +1032,7 @@ luajit:x86-windows = skip
luasocket:x64-linux=fail
luasocket:x64-osx=fail
lzfse:arm-uwp=fail
+magnum:arm64-windows=skip
marl:arm-uwp=fail
marl:x64-uwp=fail
mathgl:x64-osx=fail
@@ -1191,9 +1179,10 @@ nana:x64-linux=fail
nana:x64-osx=fail
nana:x64-uwp=fail
nanodbc:arm-uwp=fail
-nanodbc:x64-linux=fail
nanodbc:x64-osx=fail
nanodbc:x64-uwp=fail
+nanodbc:x64-linux=skip
+nanogui:arm64-windows=fail
nanorange:arm64-windows=fail
nanorange:arm-uwp=fail
nanorange:x64-linux=fail
@@ -1214,6 +1203,7 @@ nativefiledialog:x64-uwp=fail
netcdf-cxx4:x64-linux=ignore
nethost:x64-uwp=fail
nethost:arm-uwp=fail
+nettle:x64-windows=skip
networkdirect-sdk:arm64-windows=fail
networkdirect-sdk:arm-uwp=fail
networkdirect-sdk:x64-linux=fail
@@ -1283,7 +1273,6 @@ opencensus-cpp:x64-windows=fail
opencensus-cpp:x64-windows-static=fail
opencensus-cpp:x86-windows=fail
opencensus-cpp:x64-uwp=fail
-opencl:arm64-windows=fail
opencl:arm-uwp=fail
opencl:x64-uwp=fail
opencolorio:x64-linux=ignore
@@ -1467,7 +1456,6 @@ portaudio:x64-uwp=fail
portaudio:x64-windows-static=fail
portaudio:x64-windows=fail
portaudio:x86-windows=fail
-portmidi:arm64-windows=fail
portmidi:arm-uwp=fail
portmidi:x64-linux=fail
portmidi:x64-osx=fail
@@ -1584,7 +1572,6 @@ raylib:arm-uwp=fail
raylib:x64-uwp=fail
readline:arm-uwp=fail
readline:x64-uwp=fail
-readline-win32:arm64-windows=fail
readline-win32:arm-uwp=fail
readline-win32:x64-linux=fail
readline-win32:x64-osx=fail
@@ -1645,7 +1632,6 @@ sciter:x64-uwp=fail
sciter:x64-windows-static=fail
scnlib:arm-uwp=fail
scnlib:x64-uwp=fail
-scylla-wrapper:arm64-windows=fail
scylla-wrapper:arm-uwp=fail
scylla-wrapper:x64-linux=fail
scylla-wrapper:x64-osx=fail
@@ -1815,6 +1801,7 @@ tensorflow-cc:x86-windows=fail
tesseract:x64-windows=ignore
tesseract:x64-windows-static=ignore
tesseract:x86-windows=ignore
+tesseract:arm64-windows=fail
tfhe:x86-windows=fail
tfhe:x64-windows=fail
tfhe:x64-windows-static=fail
@@ -1926,6 +1913,7 @@ vxl:x64-uwp = skip
vxl:x64-windows = skip
vxl:x64-windows-static = skip
vxl:x86-windows = skip
+wampcc:arm64-windows=fail
wampcc:x64-linux=ignore
wangle:x64-linux=ignore
wavpack:arm64-windows=fail
@@ -1957,6 +1945,7 @@ wintoast:x64-uwp=fail
woff2:x64-linux=fail
woff2:x64-osx=fail
woff2:x64-windows-static=fail
+wpilib:arm64-windows=fail
wpilib:x64-osx=fail
wxchartdir:x64-osx=fail
wxwidgets:x64-linux=fail
@@ -1972,7 +1961,7 @@ x265:arm64-windows=fail
x265:arm-uwp=fail
x265:x64-uwp=fail
xalan-c:x64-windows-static=fail
-xerces-c:arm64-windows=fail
+xalan-c:arm64-windows=fail
xerces-c:arm-uwp=fail
xerces-c:x64-uwp=fail
xeus:x64-linux=ignore
@@ -1992,7 +1981,6 @@ x-plane:x64-linux=fail
x-plane:x86-windows=fail
yajl:arm-uwp=fail
yajl:x64-uwp=fail
-yara:arm64-windows=fail
yara:arm-uwp=fail
yara:x64-uwp=fail
yasm:arm64-windows=fail
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 16d214920..0c50f6da5 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,25 +1,25 @@
<?xml version="1.0"?>
<tools version="2">
<tool name="cmake" os="windows">
- <version>3.14.0</version>
- <exeRelativePath>cmake-3.14.0-win32-x86\bin\cmake.exe</exeRelativePath>
- <url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-win32-x86.zip</url>
- <sha512>60eb6a0790883da4152a957bd1133405f620f4b7a073af3bea97695b3ef8c22c41d9b90e45815f2a896df5be0cd6dedb73a6df5f17a42761ca8f457c9f3b708c</sha512>
- <archiveName>cmake-3.14.0-win32-x86.zip</archiveName>
+ <version>3.17.2</version>
+ <exeRelativePath>cmake-3.17.2-win32-x86\bin\cmake.exe</exeRelativePath>
+ <url>https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-win32-x86.zip</url>
+ <sha512>63bb3dc5a8683ed193025450620a70b8dd675eccba4a83882c96f21eda8994dd5b21854036a0c17f978bf31f67d1d1b33b416c7f6ffb0470c9f48c2e495d44c1</sha512>
+ <archiveName>cmake-3.17.2-win32-x86.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
- <version>3.14.0</version>
- <exeRelativePath>cmake-3.14.0-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
- <url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Darwin-x86_64.tar.gz</url>
- <sha512>a5a7217a049be3bb2ef5c93292b1d92eb4dd5ec6ab2dd04984aae01d2732eb343cea4f9741b333a5e21a27eb7934f568f780f3558e7ff870150c3309fc4656b3</sha512>
- <archiveName>cmake-3.14.0-Darwin-x86_64.tar.gz</archiveName>
+ <version>3.17.2</version>
+ <exeRelativePath>cmake-3.17.2-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
+ <url>https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Darwin-x86_64.tar.gz</url>
+ <sha512>804b06439c05b9cf36a988223b7dc47b06b8613cb4653989eff52aad5ab0fa312b8da1ac0c760ad101e74b2c9edaf5b119bd48617a5efb57dff9380ca74e54a9</sha512>
+ <archiveName>cmake-3.17.2-Darwin-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
- <version>3.14.0</version>
- <exeRelativePath>cmake-3.14.0-Linux-x86_64/bin/cmake</exeRelativePath>
- <url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz</url>
- <sha512>e687c0f3acfb15c880ddac67e2821907f833cb900c6ecedb4ab5df5102604d82753c948e3c7dca6e5bcce6278a09b7d577b1afade2e133aec5b2057ac48d3c74</sha512>
- <archiveName>cmake-3.14.0-Linux-x86_64.tar.gz</archiveName>
+ <version>3.17.2</version>
+ <exeRelativePath>cmake-3.17.2-Linux-x86_64/bin/cmake</exeRelativePath>
+ <url>https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.tar.gz</url>
+ <sha512>2afc023363c40b110d97d871fb9a8917643bba308ca0c029ee8fe1164db1c168e32b2c9d7647475d84efa290c1242357f7cf260ea4d1f92f5a829cf418955490</sha512>
+ <archiveName>cmake-3.17.2-Linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.12.4</version>