From 164ebe1947f05aad5b28c9f258c26f1f080500a2 Mon Sep 17 00:00:00 2001
From: Paul Druce <pjdruce@gmail.com>
Date: Mon, 20 Nov 2023 09:20:15 +0000
Subject: [PATCH] Trying to fix ubuntu builds.

---
 .github/workflows/build_and_test.yml    | 34 +++----------------------
 RFL_source/new_source/DiracOperator.hpp |  1 +
 examples/Type13/EigenvalueRecorder.cpp  |  4 ++-
 examples/Type13/Type13Metropolis.cpp    |  1 +
 playground/playground.cpp               |  1 +
 5 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 5fc7939..1ab3585 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -4,44 +4,16 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - "main"
-  pull_request:
+      - "*"
 
 jobs:
-  generate_matrix:
-    name: Generate test matrix
-    runs-on: ubuntu-latest
-    outputs:
-      matrix_includes: ${{steps.set-matrix.outputs.matrix_includes}}
-    steps:
-      - uses: actions/checkout@v3
-      - id: set-matrix
-        shell: bash
-        run: |
-          echo "Seed for random selection is = ${{github.run_number}}"
-          includes=$(python3 -u .github/workflows/combination_selection.py ${{github.run_number}} 3)
-          echo "matrix_includes=${includes}" >> $GITHUB_OUTPUT
-
-  check-matrix:
-    runs-on: ubuntu-latest
-    needs: generate_matrix
-    steps:
-      - name: Check matrix definition
-        run: |
-          includes='${{ needs.generate_matrix.outputs.matrix_includes }}'
-          echo "Json received is = $includes"
-          echo "Check that the json can be converted using GitHubs fromJSON() without error"
-          matrix_json='${{fromJson(needs.generate_matrix.outputs.matrix_includes)}}'
-
   build_and_test:
-    needs: [generate_matrix, check-matrix]
     strategy:
       fail-fast: false
       matrix:
-        BUILD_TYPE: [Release]
-        OS: [ubuntu-22.04]
+        BUILD_TYPE: [ Debug ]
+        OS: [ ubuntu-latest, macos-latest ]
         ARMA_VERSION: [11.2.3]
-        include: ${{fromJSON(needs.generate_matrix.outputs.matrix_includes)}}
 
     # The CMake configure and build commands are platform-agnostic and should
     # work equally well on Windows or Mac. You can convert this to a matrix
diff --git a/RFL_source/new_source/DiracOperator.hpp b/RFL_source/new_source/DiracOperator.hpp
index 87e9594..281d5ac 100644
--- a/RFL_source/new_source/DiracOperator.hpp
+++ b/RFL_source/new_source/DiracOperator.hpp
@@ -9,6 +9,7 @@
 #include "IDiracOperator.hpp"
 #include "IRng.hpp"
 #include <armadillo>
+#include <memory>
 
 /**
  * @class DiracOperator
diff --git a/examples/Type13/EigenvalueRecorder.cpp b/examples/Type13/EigenvalueRecorder.cpp
index 2530001..d55fa12 100644
--- a/examples/Type13/EigenvalueRecorder.cpp
+++ b/examples/Type13/EigenvalueRecorder.cpp
@@ -3,6 +3,8 @@
 //
 
 #include "EigenvalueRecorder.hpp"
+#include <filesystem>
+#include <iomanip>
 
 namespace fs = std::filesystem;
 
@@ -24,7 +26,7 @@ static std::string create_simulation_group(const std::string& timeString) {
   return ss.str();
 }
 
-static std::string create_eigenvalues_hdf_filename(const struct diracData& data, const double g2) {
+static std::string create_eigenvalues_hdf_filename(const diracData& data, const double g2) {
   std::ostringstream ss;
 
   ss << -1 * g2;
diff --git a/examples/Type13/Type13Metropolis.cpp b/examples/Type13/Type13Metropolis.cpp
index f41b244..ce16372 100644
--- a/examples/Type13/Type13Metropolis.cpp
+++ b/examples/Type13/Type13Metropolis.cpp
@@ -8,6 +8,7 @@
 #include "EigenvalueRecorder.hpp"
 #include "GslRng.hpp"
 #include "Simulation.hpp"
+#include <iomanip>
 
 using namespace arma;
 
diff --git a/playground/playground.cpp b/playground/playground.cpp
index 666d7d7..6dac331 100644
--- a/playground/playground.cpp
+++ b/playground/playground.cpp
@@ -3,6 +3,7 @@
 //
 
 #include <iostream>
+#include <memory>
 
 class Action {
 public: