Skip to content

Commit

Permalink
Trying to fix ubuntu builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
pauldruce committed Nov 20, 2023
1 parent 1701c44 commit 164ebe1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 32 deletions.
34 changes: 3 additions & 31 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions RFL_source/new_source/DiracOperator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "IDiracOperator.hpp"
#include "IRng.hpp"
#include <armadillo>
#include <memory>

/**
* @class DiracOperator
Expand Down
4 changes: 3 additions & 1 deletion examples/Type13/EigenvalueRecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
//

#include "EigenvalueRecorder.hpp"
#include <filesystem>
#include <iomanip>

namespace fs = std::filesystem;

Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions examples/Type13/Type13Metropolis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "EigenvalueRecorder.hpp"
#include "GslRng.hpp"
#include "Simulation.hpp"
#include <iomanip>

using namespace arma;

Expand Down
1 change: 1 addition & 0 deletions playground/playground.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//

#include <iostream>
#include <memory>

class Action {
public:
Expand Down

0 comments on commit 164ebe1

Please sign in to comment.