Build Fixes 2022-05-01 (#24497)

Discovered in https://dev.azure.com/vcpkg/public/_build/results?buildId=71530 PASSING, REMOVE FROM FAIL LIST: blosc:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: corrade:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: corrade:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libhydrogen:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: sundials:x64-osx failed with BUILD_FAILED. If expected, add sundials:x64-osx=fail to /Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt. File does not have the expected hash: url : [ https://github.com/LLNL/sundials/archive/v5.8.0.tar.gz ] File path : [ /Users/vagrant/Data/downloads/LLNL-sundials-v5.8.0.tar.gz.98418.part ] Expected hash : [ 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372 ] Actual hash : [ 0b11db1b944cfce4672954aceeec3f21253b4f684031f26b8bc0a8b3b12d895e604456bd1f283767812352eb5a9202c5797f612410f654f561ca5565d719bcae ] REGRESSION: brunocodutra-metal:x64-linux failed with BUILD_FAILED. If expected, add brunocodutra-metal:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. This was another download failure but may as well update. REGRESSION: plplot:x64-linux failed with BUILD_FAILED. If expected, add plplot:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. This was another download failure with every SourceForge mirror giving a different hash O_O. I tried to do an update but it's ... involved for this library so I've separated it.
microsoft · May 4, 2022 · d5bb8c1 · d5bb8c1
1 parent b98afc9
commit d5bb8c1
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 18 deletions.
diff --git a/ports/brunocodutra-metal/portfile.cmake b/ports/brunocodutra-metal/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO brunocodutra/metal
-    REF 2.1.3
-    SHA512 7a71f8bdbdb8a19084d0cabd4c78a4f2990514f2da56312aec8dfac02f6781c95f28bc33815ecbb3d9e3e8d2b47cc5dbcd4917751195a8318bea7c08fca29b23
+    REF 9db9b403e58e0be0bbd295ff64f01e700965f25d
+    SHA512 b611d88d310893329f48111716c849571cb1459da1e71851bf3ec7393f18f8eb94077ce12410a9bcb1953e6b4ea0e8f2d2db5ce7f555a72ab2b7dae434b52d62
     HEAD_REF master
 )
 

diff --git a/ports/brunocodutra-metal/vcpkg.json b/ports/brunocodutra-metal/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "brunocodutra-metal",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "A single header C++11 library designed to make you love template metaprogramming",
   "dependencies": [
     {

diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LLNL/sundials
-    REF v5.8.0
-    SHA512 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372
+    REF e2f29c34f324829302037a1492db480be8828084
+    SHA512 9af9a5d7a44de1f2afbc35d8e2ec3d35a2d15f1b708be7a90bf849a0d0576fda6c73fae6b8954025805ac1ca25468558c02dcc2fd86b5767699518988817d4d8
     HEAD_REF master
     PATCHES
         install-dlls-in-bin.patch
@@ -12,20 +12,20 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS 
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
         -D_BUILD_EXAMPLES=OFF
         -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
         -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
 )
 
-vcpkg_cmake_install(DISABLE_PARALLEL)
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE")
 file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE")
 
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
diff --git a/ports/sundials/vcpkg.json b/ports/sundials/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sundials",
-  "version-semver": "5.8.0",
+  "version-semver": "6.2.0",
   "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)",
   "homepage": "https://computation.llnl.gov/projects/sundials",
   "dependencies": [

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -54,7 +54,6 @@ bitserializer:x64-osx=fail
 blitz:x64-uwp=fail
 blitz:arm64-windows=fail
 blitz:arm-uwp=fail
-blosc:arm64-windows=fail
 bond:arm-uwp=fail
 bond:x64-osx=fail
 bond:x64-uwp=fail
@@ -160,8 +159,6 @@ coolprop:x64-uwp=fail
 coroutine:arm-uwp=fail
 coroutine:x64-linux=fail
 coroutine:x64-uwp=fail
-corrade:arm-uwp=fail
-corrade:x64-uwp=fail
 cppcms:x64-linux=fail
 cppcms:x64-osx=fail
 cppcms:x64-windows-static=fail
@@ -477,7 +474,6 @@ libgpg-error:x64-uwp=fail
 
 libhdfs3:x64-linux=fail
 libhdfs3:x64-osx=fail
-libhydrogen:arm64-windows=fail
 libigl:arm64-windows=fail
 libigl:arm-uwp=fail
 libigl:x64-uwp=fail

diff --git a/versions/b-/brunocodutra-metal.json b/versions/b-/brunocodutra-metal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8cf9fc40f35037ebc568d8da494ba1c84221327d",
+      "version": "2.1.4",
+      "port-version": 0
+    },
     {
       "git-tree": "54b5610e8e1541618650eec938a77148866716cc",
       "version": "2.1.3",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1157,7 +1157,7 @@
       "port-version": 7
     },
     "brunocodutra-metal": {
-      "baseline": "2.1.3",
+      "baseline": "2.1.4",
       "port-version": 0
     },
     "brynet": {
@@ -6817,7 +6817,7 @@
       "port-version": 1
     },
     "sundials": {
-      "baseline": "5.8.0",
+      "baseline": "6.2.0",
       "port-version": 0
     },
     "superlu": {

diff --git a/versions/s-/sundials.json b/versions/s-/sundials.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c95957f06e56f03fb6336a30a984ff7273a36c5a",
+      "version-semver": "6.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "206df7509167e6e89bdac2e9252e9e57615e18a4",
       "version-semver": "5.8.0",