From 1789a21b78c87e78093c6bcfc46cfb2c598be230 Mon Sep 17 00:00:00 2001
From: Jeff Trull <edaskel@att.net>
Date: Thu, 14 Nov 2024 19:21:25 -0800
Subject: [PATCH] Another try at getting CI right

It seems like there are some things that mysterious are not
dependencies of one of my packages (probably Qt) that must be
supplied *in the system* rather than through the normal process, and
also cannot be expressed by Qt (or whatever), which is strange, but I
am going to try adding it in via "apt install".

Also add missing Boost.Spirit, Boost.Test, and Eigen3
---
 .github/workflows/ci.yml | 8 +++++++-
 vcpkg.json               | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16eeed8..157f34c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,12 +48,18 @@ jobs:
       with:
         submodules: true
 
-    - name: Restore from cache and setup vcpkg executable and data files.
+    - name: Set up vcpkg and install our dependencies
       uses: lukka/run-vcpkg@v11
       with:
         vcpkgJsonGlob: 'vcpkg.json'
         runVcpkgInstall: true
 
+    - name: Get runtime system dependencies for building Qt (?)
+      if: matrix.c_compiler != 'cl'
+      shell: bash
+      run: |
+        apt install libxi-dev libxtst-dev
+
     - name: Set reusable strings
       # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
       id: strings
diff --git a/vcpkg.json b/vcpkg.json
index fffefb1..cd231ac 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -4,8 +4,10 @@
   "dependencies": [
       "boost-program-options",
       "boost-config",
+      "boost-spirit",
+      "boost-test"
+      "eigen3",
       "qt5-base",
-      "tcl",
-      "libxtst"
+      "tcl"
   ]
 }