Skip to content

Commit

Permalink
Technical git/gitHub update: master branch (#435)
Browse files Browse the repository at this point in the history
* Remove CI test for macOS

* Ignore byte-compiled python files
  • Loading branch information
TomasTorsvik authored Nov 26, 2024
1 parent 79081d8 commit 884fe3c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest] # Testing with macos-latest currently not working
mpi: [true, false]
openmp: ['enabled', 'disabled']
ecosys: [false] # ecosys==true fails with gcc, disable for now but leave placeholder
exclude:
# Do not build on macOS with MPI as that is having some dependency issues
- os: macos-latest
mpi: true
# Do not build on macOS with OpenMP. This cause an error as discussed in PR
# https://github.com/NorESMhub/BLOM/pull/317#issuecomment-2191552330
- os: macos-latest
openmp: 'enabled'
# # Do not build on macOS with MPI as that is having some dependency issues
# - os: macos-latest
# mpi: true
# # Do not build on macOS with OpenMP. This cause an error as discussed in PR
# # https://github.com/NorESMhub/BLOM/pull/317#issuecomment-2191552330
# - os: macos-latest
# openmp: 'enabled'
# Run test (fuk95 executed with mpi=false) fails with ecosys
- ecosys: true
mpi: false
Expand All @@ -33,11 +33,11 @@ jobs:
sudo apt install -y libnetcdff-dev mpi-default-dev ninja-build
if: runner.os == 'Linux'

- name: Install dependencies - macOS
run: brew install netcdf-fortran open-mpi ninja
env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
if: runner.os == 'macOS'
# - name: Install dependencies - macOS
# run: brew install netcdf-fortran open-mpi ninja
# env:
# HOMEBREW_NO_INSTALL_CLEANUP: 1
# if: runner.os == 'macOS'

- name: Setup Python for newer version of Meson
uses: actions/setup-python@v5
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Ignore build output directory created by Meson
builddir/

# Ignore byte-compiled files
__pycache__/

0 comments on commit 884fe3c

Please sign in to comment.