CI fixes

Author: jacobwilliams

.github/workflows/CI.yml

@@ -22,7 +22,7 @@ jobs:
       #  9 - build.sh with documentation, unit tests and coverage analysis. doc deployment
       #  10 - build.sh - no documentation, with and without unicode.
       #  11 - FPM
-      #  15 - CMake build with unit tests, no documentation, with coverage analysis. no unicode
+      #  14 - CMake build with unit tests, no documentation, with coverage analysis. no unicode
       #
       # NOTE: coverage disabled for now
 
@@ -34,13 +34,12 @@ jobs:
         submodules: recursive
 
     - name: Setup cmake
-      if: contains( matrix.gcc_v, 15 )
       uses: jwlawson/actions-setup-cmake@v2.0.2
       with:
         cmake-version: '3.28.x'
 
     - name: Install Python
-      uses: actions/setup-python@v5.1.0 # Use pip to install latest CMake, & FORD/Jin2For, etc.
+      uses: actions/setup-python@v5.1.0
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -53,15 +52,11 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install Python dependencies
-      if: contains( matrix.os, 'ubuntu')
       run: |
         python -m pip install --upgrade pip
-        #pip install ford FoBiS.py pygooglechart fpm
         pip install ford FoBiS.py pygooglechart
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
     - name: Install GFortran Linux
-      if: contains( matrix.os, 'ubuntu')
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
@@ -93,7 +88,7 @@ jobs:
       # CMake build with unit tests, no documentation, with coverage analysis
       # No unicode so that coverage combined with the build script will cover unicode
       # and non-unicode code paths
-      if: matrix.gcc_v == 15
+      if: matrix.gcc_v == 14
       run: |
         GFORTRAN=gfortran-${{matrix.gcc_v}}
         GCOV=gcov-${{matrix.gcc_v}}