diff --git a/.github/workflows/test_macos12.yml b/.github/workflows/test_macos.yml similarity index 78% rename from .github/workflows/test_macos12.yml rename to .github/workflows/test_macos.yml index d389cffe..677be326 100644 --- a/.github/workflows/test_macos12.yml +++ b/.github/workflows/test_macos.yml @@ -1,8 +1,8 @@ -name: macOS 12 +name: macOS on: [push, pull_request] jobs: test: - runs-on: macos-12 + runs-on: macos-latest steps: - uses: actions/checkout@v3 - name: Install MacOS dependencies @@ -12,6 +12,12 @@ jobs: brew install lcov sudo ln -s /usr/local/opt/qt5/mkspecs /usr/local/mkspecs sudo ln -s /usr/local/opt/qt5/plugins /usr/local/plugins + # Install Miniconda + - name: Install Miniconda + run: | + curl -O https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + bash Miniconda3-latest-MacOSX-x86_64.sh -b -p $HOME/miniconda + echo "$HOME/miniconda/bin" >> $GITHUB_PATH - name: Build svZeroDSolver run: | git clone https://github.com/SimVascular/svZeroDSolver.git @@ -38,4 +44,4 @@ jobs: - name: Run unit tests run: | cd build/svFSI-build/Source/svFSI - ctest --verbose \ No newline at end of file + ctest --verbose diff --git a/tests/cases/fluid/newtonian/svFSIplus.xml b/tests/cases/fluid/newtonian/svFSIplus.xml index 4cb18417..7f2918db 100644 --- a/tests/cases/fluid/newtonian/svFSIplus.xml +++ b/tests/cases/fluid/newtonian/svFSIplus.xml @@ -45,7 +45,7 @@ true 1 - 4 + 10 1e-11 0.2 @@ -69,7 +69,7 @@ fsils 100 - 1e-12 + 1e-14