From bda71b31887eeda0c4e1fe5ce928d3087bbd473c Mon Sep 17 00:00:00 2001
From: Christian Gutschow <chris.g@cern.ch>
Date: Thu, 28 Nov 2024 11:23:19 +0000
Subject: [PATCH] add Fedora to the matrix

---
 .github/workflows/cmake.yml         | 41 +++++------------------------
 .github/workflows/documentation.yml |  6 ++---
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 736546d8a..d9d19bed7 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -23,10 +23,6 @@ jobs:
     # Skip CI if PR is a draft
     if: github.event.pull_request.draft == false
     name: ${{matrix.os}}-${{matrix.container}}-${{matrix.cxx}}-mpi:${{matrix.mpi}}-openmp:${{matrix.omp}}
-    # 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 build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ${{matrix.os}}
     container: ${{matrix.container}}
     env:
@@ -35,36 +31,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          #os: [ ubuntu-20.04, macos-14 ]
-          #cc: [ gcc-10, clang ]
-          #cxx: [ g++-10, clang++ ]
-          #mpi: [ "ON", "OFF" ]
-          #omp: [ "ON", "OFF" ]
-          #container: [ fedora:39, "" ]
-          #exclude:
-          #  - cc: gcc-10
-          #    cxx: clang++
-          #  - cc: clang
-          #    cxx: g++-10
-          #  - os: ubuntu-20.04
-          #    cc: clang
-          #    cxx: clang++
-          #  - os: macos-14
-          #    mpi: "ON"
-          #  # This doesn't seem to work with ONNXrt yet:
-          #  - os: macos-14
-          #    cxx: g++-10
           include:
             - { os: ubuntu-20.04, cxx: g++-10, mpi: "ON", omp: "ON" }
             - { os: ubuntu-20.04, cxx: g++-10, mpi: "ON", omp: "OFF" }
             - { os: ubuntu-20.04, cxx: g++-10, mpi: "OFF", omp: "ON" }
-            #- os: ubuntu-20.04
-            #  cc: gcc-10, cxx: g++-10, mpi: "OFF", omp: "OFF" ]
-            #- os: ubuntu-20.04, container: fedora:39, cc: gcc-10, cxx: g++-10, mpi: "ON", omp: "ON" ]
-            #- os: macos-14, cc: clang, cxx: clang++, mpi: "ON", omp: "ON" ]
-            #- os: macos-14, cc: clang, cxx: clang++, mpi: "OFF", omp: "OFF" ]
-            #- [ os: macos-14, cc: clang, cxx: clang++, mpi: "OFF", omp: "ON" ]
-            #- [ os: macos-14, cc: clang, cxx: clang++, mpi: "ON", omp: "OFF" ]
+            - { os: ubuntu-20.04, cxx: g++-10, mpi: "OFF", omp: "OFF" }
+            - { os: ubuntu-20.04, container: fedora:39, cxx: g++-10, mpi: "ON", omp: "ON" }
+            - { os: macos-14, cxx: clang++, mpi: "ON", omp: "ON" }
+            - { os: macos-14, cxx: clang++, mpi: "OFF", omp: "OFF" }
+            #- { os: macos-14, cxx: clang++, mpi: "OFF", omp: "ON" }
+            #- { os: macos-14, cxx: clang++, mpi: "ON", omp: "OFF" }
 
     steps:
     - uses: actions/checkout@v3
@@ -104,11 +80,6 @@ jobs:
         echo "/opt/homebrew/opt/ccache/libexec" >> $GITHUB_PATH
         #echo "/opt/homebrew/opt/libomp" >> $GITHUB_PATH
 
-    #- name: Install gcc on MacOS
-    #  if: ${{ contains(matrix.os, 'macos') && contains(matrix.cxx, 'g++10') }}
-    #  run: |
-    #    brew install gcc@10
-
     # Enable tmate debugging of manually-triggered workflows if the input option was provided
     - name: Setup tmate session
       uses: mxschmitt/action-tmate@v3
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 6430ad76a..870fb0acb 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -19,7 +19,6 @@ env:
 jobs:
   make-documentation:
     runs-on: ubuntu-22.04
-    container: fedora:39
     steps:
       - name: Check out sopt
         uses: actions/checkout@v3
@@ -31,9 +30,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo dnf -y update
-          sudo dnf -y install cmake gcc gcc-c++
-          sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff-devel git
+          sudo apt update
+          sudo apt install openmpi-bin libopenmpi-dev libyaml-cpp-dev doxygen graphviz ccache libeigen3-dev libtiff-dev
 
       - name: Checkout Catch2
         uses: actions/checkout@v4