From 5a3de2dd9683ad57fade1ae653884b4a1c329f2b Mon Sep 17 00:00:00 2001
From: HS <hs@apotell.com>
Date: Tue, 8 Aug 2023 01:36:00 -0700
Subject: [PATCH] Lock capnpproto to v1.0.0

Also, remove flatbuffers.
---
 .github/workflows/non_vendored.yml | 15 +++++----------
 third_party/UHDM                   |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/non_vendored.yml b/.github/workflows/non_vendored.yml
index 537d0ba367..10040462ac 100644
--- a/.github/workflows/non_vendored.yml
+++ b/.github/workflows/non_vendored.yml
@@ -43,22 +43,17 @@ jobs:
 
     - name: Install vendored dependencies
       run: |
-        git clone https://github.com/google/flatbuffers.git
-        pushd flatbuffers
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON . && cmake --build build && sudo cmake --install build
-        popd
-
-        git clone https://github.com/google/googletest.git
+        git clone --depth 1 https://github.com/google/googletest.git
         pushd googletest
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON . && cmake --build build && sudo cmake --install build
         popd
 
-        git clone https://github.com/capnproto/capnproto.git
+        git clone --depth 1 --branch v1.0.0 https://github.com/capnproto/capnproto.git
         pushd capnproto
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON . && cmake --build build && sudo cmake --install build
         popd
 
-        git clone https://github.com/chipsalliance/UHDM.git
+        git clone --depth 1 https://github.com/chipsalliance/UHDM.git
         pushd UHDM
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DUHDM_USE_HOST_GTEST=ON -DUHDM_USE_HOST_CAPNP=ON . && cmake --build build && sudo cmake --install build
         popd
@@ -85,7 +80,7 @@ jobs:
         # for any run checks, such as those in the `TestInstall` project
         export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
-        cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DBUILD_SHARED_LIBS=ON -DSURELOG_USE_HOST_FLATBUFFERS=ON -DSURELOG_USE_HOST_ANTLR=ON -DSURELOG_USE_HOST_UHDM=ON -DSURELOG_USE_HOST_GTEST=ON -DSURELOG_WITH_TCMALLOC=OFF -DCMAKE_MODULE_PATH="/usr/share/CMake/Modules;/usr/local/lib/cmake" -S . -B build
+        cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DBUILD_SHARED_LIBS=ON -DSURELOG_USE_HOST_ANTLR=ON -DSURELOG_USE_HOST_UHDM=ON -DSURELOG_USE_HOST_GTEST=ON -DSURELOG_WITH_TCMALLOC=OFF -DCMAKE_MODULE_PATH="/usr/share/CMake/Modules;/usr/local/lib/cmake" -S . -B build
         cmake --build build -j $(nproc)
         cmake --install build
 
@@ -97,7 +92,7 @@ jobs:
         # this shouldnt be necessary, and can't be reproduced outside CI
         export CMAKE_PREFIX_PATH=$INSTALL_DIR
 
-        cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_DIR=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DBUILD_SHARED_LIBS=ON -DSURELOG_USE_HOST_FLATBUFFERS=ON -DSURELOG_USE_HOST_ANTLR=ON -DSURELOG_USE_HOST_UHDM=ON -DSURELOG_USE_HOST_GTEST=ON -S tests/TestInstall -B tests/TestInstall/build
+        cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_DIR=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DBUILD_SHARED_LIBS=ON -DSURELOG_USE_HOST_ANTLR=ON -DSURELOG_USE_HOST_UHDM=ON -DSURELOG_USE_HOST_GTEST=ON -S tests/TestInstall -B tests/TestInstall/build
         cmake --build tests/TestInstall/build -j $(nproc)
 
         echo "-- pkg-config content --"
diff --git a/third_party/UHDM b/third_party/UHDM
index 2a9475691e..8c7074b6c9 160000
--- a/third_party/UHDM
+++ b/third_party/UHDM
@@ -1 +1 @@
-Subproject commit 2a9475691e0d48fe7669e8ed77c942eda10b7e05
+Subproject commit 8c7074b6c952b17d8b6e0a89a679cce4448e9c8d