Skip to content

Commit

Permalink
Merge branch 'develop' into jba_mxbf
Browse files Browse the repository at this point in the history
  • Loading branch information
jbathegit authored Oct 25, 2024
2 parents 910ae58 + 398e021 commit 731a715
Show file tree
Hide file tree
Showing 5 changed files with 437 additions and 238 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@ on:

jobs:
Linux:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
ccompiler: [clang, gcc-9, gcc-10]
ccompiler: [clang, gcc-12, gcc-13]

steps:

- name: install-deps
run: |
sudo apt-get update
sudo apt-get install python3-pip python3-dev python3-numpy
sudo python3 -m pip install -U pip
sudo python3 -m pip install -U netCDF4
sudo python3 -m pip install -U pdoc
sudo apt-get install python3-pip python3-dev python3-numpy meson
sudo python3 -m pip install --break-system-packages -U netCDF4
sudo python3 -m pip install --break-system-packages -U pdoc
- name: checkout
uses: actions/checkout@v4
Expand All @@ -46,12 +45,12 @@ jobs:
run: |
if [[ ${{ matrix.ccompiler }} == "clang" ]]; then
export CC=clang
elif [[ ${{ matrix.ccompiler }} == "gcc-9" ]]; then
export CC=gcc-9
export FC=gfortran-9
elif [[ ${{ matrix.ccompiler }} == "gcc-10" ]]; then
export CC=gcc-10
export FC=gfortran-10
elif [[ ${{ matrix.ccompiler }} == "gcc-12" ]]; then
export CC=gcc-12
export FC=gfortran-12
elif [[ ${{ matrix.ccompiler }} == "gcc-13" ]]; then
export CC=gcc-13
export FC=gfortran-13
fi
cd bufr
mkdir build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: install-python
if: ${{ contains(matrix.variants, '+python') }}
run: |
sudo apt install python3 python3-numpy
sudo apt install python3 python3-numpy meson
- name: cache-data
id: cache-data
Expand All @@ -52,8 +52,8 @@ jobs:
spack env activate bufr-env
cp $GITHUB_WORKSPACE/bufr/spack/package.py $SPACK_ROOT/var/spack/repos/builtin/packages/bufr/package.py
spack develop --no-clone --path $GITHUB_WORKSPACE/bufr bufr@develop test_files=/home/runner/data
spack add bufr@develop%gcc@11 ${{ matrix.variants }}
spack external find cmake gmake python py-numpy
spack add bufr@develop%gcc@12 ${{ matrix.variants }}
spack external find cmake gmake python py-numpy meson
spack concretize
# Run installation and run CTest suite
spack install --verbose --fail-fast --test root
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
developer:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
FC: gfortran-11
CC: gcc-11
Expand Down
Loading

0 comments on commit 731a715

Please sign in to comment.