Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Travis to gh-actions #388

Closed
Closed
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
37 changes: 37 additions & 0 deletions .github/workflows/run_test_suite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# MARBL continuous integration testing (via Github Actions)
name: MARBL CI

on:
push:
branches: [ stable, development ]
pull_request:
branches: [ stable, development ]

jobs:
MARBL-Testing:
runs-on: ubuntu-20.04

strategy:
matrix:
python-version:
- 3.7

steps:
- uses: actions/checkout@v2

- name: Load Environment
run: |
sudo apt-get update
sudo apt install make gfortran netcdf-bin libnetcdf-dev libnetcdff-dev openmpi-bin libopenmpi-dev

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: $ {{ matrix.python-version }}

# - name: build-docs

- name: Run Tests
run : |
cd MARBL_tools
./run_test_suite.sh
25 changes: 0 additions & 25 deletions .travis.yml

This file was deleted.

11 changes: 7 additions & 4 deletions tests/driver_src/marbl_mpi_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ module marbl_mpi_mod
! This module contains wrappers for all MPI calls so that marbl.F90
! does not need to have #ifdef macros scattered throughout

implicit none
public

#define MPI 1
#if MARBL_TIMING_OPT == MPI
#define MARBL_WITH_MPI
#endif

#ifdef MARBL_WITH_MPI
include 'mpif.h'
use mpi
#endif

implicit none
public

#ifdef MARBL_WITH_MPI
logical, parameter :: mpi_on = .true.
#else
logical, parameter :: mpi_on = .false.
Expand Down