Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/gfortran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,15 @@ jobs:

basic_build:
name: Basic build
runs-on: ubuntu-22.04
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
gcc_v: [9, 12]
os: [ubuntu-22.04]
gcc_v: [9, 13]
include:
- os: macos-14
gcc_v: 13
env:
FC: gfortran
GCC_V: ${{ matrix.gcc_v}}
Expand All @@ -49,11 +53,10 @@ jobs:
with:
fetch-depth: 2

- name: Set GFortran version
run: |
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
--slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
- uses: fortran-lang/setup-fortran@v1
with:
compiler: gcc
version: ${{ matrix.gcc_v }}

# pFUnit library is used to build and run unit tests
- name: pFUnit build Cache
Expand Down
2 changes: 1 addition & 1 deletion dev_scripts/install_pfunit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ git clone --recursive https://github.com/Goddard-Fortran-Ecosystem/pFUnit $REPO_

# This seems to be the last commit that works with GCC-7
# Later commits fail with internal compiler error when compiling fArgParse submodule.
git checkout --recurse-submodules 0a09db354b665f1518e36460396c348c19185e04
#git checkout --recurse-submodules 0a09db354b665f1518e36460396c348c19185e04

mkdir -p build && cd build
export FC=gfortran
Expand Down
2 changes: 1 addition & 1 deletion tests/numdiff.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import argparse
import decimal
import os.path
Expand Down
8 changes: 8 additions & 0 deletions tests/test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
#!/bin/bash

# Stop on any error
set -euo pipefail

# Make sure that '[A-Z]' regex works as expected,
# i.e. only matches capital letters, regardless of global collate settings.
# This workaround is needed for MacOS 15,
# but is probably a good idea in general to make this script robust.
export LC_ALL=C

# Parameters are passed from Makefile.
if [[ $# -ne 8 ]]; then
echo "ERROR: Incorrect number of parameters passed to $0"
Expand Down
Loading