update vcpkg baseline and dependencies

Open-Transactions · Sep 9, 2024 · 7597c09 · 7597c09
1 parent 326ec2b
commit 7597c09
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 9 deletions.
diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml
@@ -26,6 +26,47 @@ jobs:
       VCPKG_DEFAULT_HOST_TRIPLET: '${{ matrix.triplet }}'
       VCPKG_OVERLAY_TRIPLETS: '${{ github.workspace }}/overlay/triplets'
     steps:
+      - name:  Get more disk space
+        run:   |
+            if [ "$RUNNER_OS" == "Linux" ]; then
+                sudo rm -rvf /usr/lib/mono
+                sudo rm -rvf /usr/local/lib/android
+                sudo rm -rvf /usr/local/share/vcpkg
+                sudo rm -rvf /usr/share/miniconda
+            elif [ "$RUNNER_OS" == "macOS" ]; then
+                sudo rm -rvf "/Applications/Xcode_14.3.1.app"
+                sudo rm -rvf "/Library/Frameworks/Mono.framework"
+                sudo rm -rvf "/Users/runner/Library/Android"
+                sudo rm -rvf "/usr/bin/link"
+                sudo rm -rvf "/usr/bin/link"
+                sudo rm -rvf "/usr/local/miniconda"
+                sudo rm -rvf "/usr/local/opt/geckodriver/bin"
+                sudo rm -rvf "/usr/local/share/chromedriver-mac-x64"
+                sudo rm -rvf "/usr/local/share/edge_driver"
+                sudo rm -rvf "/usr/local/share/vcpkg"
+                sudo rm -rvf '${GOROOT_1_20_X64}'
+                sudo rm -rvf '${GOROOT_1_21_X64}'
+                sudo rm -rvf '${GOROOT_1_22_X64}'
+                sudo rm -rvf '${JAVA_HOME_8_X64}'
+                sudo rm -rvf '${JAVA_HOME_11_X64}'
+                sudo rm -rvf '${JAVA_HOME_17_X64}'
+                sudo rm -rvf '${JAVA_HOME_21_X64}'
+            elif [ "$RUNNER_OS" == "Windows" ]; then
+                rm -rvf "C:\Android"
+                rm -rvf "C:\Miniconda"
+                rm -rvf "C:\Program Files\dotnet"
+                rm -rvf "C:\SeleniumWebDrivers\"
+                rm -rvf "C:\selenium\"
+                rm -rvf "C:\tools\Apache24"
+                rm -rvf "C:\tools\nginx-1.27.0"
+                rm -rvf "C:\vcpkg"
+                rm -rvf '${JAVA_HOME_8_X64}'
+                rm -rvf '${JAVA_HOME_11_X64}'
+                rm -rvf '${JAVA_HOME_17_X64}'
+                rm -rvf '${JAVA_HOME_21_X64}'
+            fi
+        shell: bash
+        continue-on-error: true
       - name: Setup XCode
         if: runner.os == 'macOS'
         uses: maxim-lobanov/setup-xcode@v1

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -2,14 +2,15 @@
     "default-registry": {
         "kind": "git",
         "repository": "https://github.com/microsoft/vcpkg",
-        "baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625"
+        "baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da"
     },
     "registries": [
         {
             "kind": "git",
             "repository": "https://github.com/Open-Transactions/vcpkg-registry",
-            "baseline": "ab9c0ab78566f9da15492bc432786b3c5a3092ed",
+            "baseline": "ac6703c4c36e46559ee2e0522f663427161eeaf5",
             "packages": [
+                "libsodium",
                 "otcommon"
             ]
         }

diff --git a/vcpkg.json b/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema":
       "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "opentxs-dependency-builder",
-  "builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625",
+  "builtin-baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da",
   "version": "1",
     "dependencies": [
         "boost-algorithm",
@@ -19,10 +19,8 @@
         "boost-dynamic-bitset",
         "boost-endian",
         "boost-interprocess",
-        "boost-intrusive",
         "boost-iostreams",
         "boost-json",
-        "boost-move",
         "boost-multiprecision",
         "boost-program-options",
         "boost-scope",
@@ -36,16 +34,36 @@
         "frozen",
         "gtest",
         "libguarded",
-        "libsodium",
+        {
+            "name": "libsodium",
+            "version>=": "1.0.20#103"
+        },
         "lmdb",
-        "openssl",
-        "otcommon",
+        {
+            "name": "openssl",
+            "version>=": "3.2.0"
+        },
+        {
+            "name": "otcommon",
+            "version>=": "3.1.2"
+        },
         "protobuf",
+        {
+            "name": "protobuf",
+            "host": true
+        },
         {
             "name": "pthread",
             "platform": "windows"
         },
-        "qtbase",
+        {
+            "name": "qtbase",
+            "default-features": false,
+            "features": [
+                "gui",
+                "widgets"
+            ]
+        },
         "qtdeclarative",
         "secp256k1",
         "simpleini",
@@ -54,6 +72,7 @@
         {
             "name": "zeromq",
             "features": [
+                "curve",
                 "sodium"
             ]
         },