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

[CI] Update CI workflow #946

Merged
merged 2 commits into from
Dec 11, 2020
Merged
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
43 changes: 26 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@ on:

jobs:
ubuntu-multiple-pythons:
name: Ubuntu 18.04 with Python ${{ matrix.python-version }}
runs-on: ubuntu-latest
name: Ubuntu with Python ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [ '3.5', '3.6', '3.7', '3.8' ]
python-version: [ '3.5', '3.6', '3.7', '3.8', '3.9' ]
os: ['ubuntu-18.04', 'ubuntu-20.04']
fail-fast: false
steps:
- uses: actions/checkout@v2
name: Checkout the repository
with:
submodules: recursive
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand All @@ -45,18 +46,19 @@ jobs:

macos-multiple-pythons:
name: macOS with Python ${{ matrix.python-version }}
runs-on: macos-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [ '3.5', '3.6', '3.7', '3.8' ]
os: ['macos-10.15', 'macos-11.0']
fail-fast: false
steps:
- uses: actions/checkout@v2
name: Checkout the repository
with:
submodules: recursive
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand Down Expand Up @@ -85,7 +87,7 @@ jobs:
with:
submodules: recursive
- name: Setup python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.8'
architecture: x64
Expand Down Expand Up @@ -116,7 +118,7 @@ jobs:
with:
submodules: recursive
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.8'
architecture: x64
Expand Down Expand Up @@ -174,15 +176,19 @@ jobs:
run-examples:
name: Run the Python examples using bash
runs-on: ubuntu-18.04
strategy:
matrix:
python-version: ['3.5', '3.6', '3.7', '3.8', '3.9']
fail-fast: false
steps:
- uses: actions/checkout@v2
name: Checkout the repository
with:
submodules: recursive
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: ${{ matrix.python-version }}
architecture: x64
- name: Install Apt dependencies
run: sudo apt-get install libboost-dev gfortran graphviz liblapack-dev libblas-dev
Expand Down Expand Up @@ -221,7 +227,7 @@ jobs:
name: Checkout the repository
with:
submodules: recursive
- uses: goanpeca/setup-miniconda@v1
- uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
python-version: 3.8
Expand All @@ -231,7 +237,7 @@ jobs:
- name: Install conda dependencies
shell: bash -l {0}
run: |
conda install -q sundials=${{ matrix.sundials-ver}} scons numpy ruamel_yaml \
conda install -q sundials=${{ matrix.sundials-ver }} scons numpy ruamel_yaml \
cython libboost fmt eigen yaml-cpp h5py pandas
- name: Build Cantera
run: |
Expand All @@ -252,7 +258,7 @@ jobs:
with:
submodules: recursive
- name: Setup python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.8'
architecture: x64
Expand All @@ -276,7 +282,7 @@ jobs:
matrix:
os: ['windows-2019']
vs-toolset: ['14.0', '14.2']
python-version: [ '3.5', '3.6', '3.7', '3.8' ]
python-version: [ '3.5', '3.6', '3.7', '3.8', '3.9' ]
# Must use windows-2016 image because it installs VS2017 (MSVC 14.1)
# Scons cannot find MSVC 14.1 when VS2019 is installed
include:
Expand All @@ -292,24 +298,27 @@ jobs:
- os: 'windows-2016'
vs-toolset: '14.1'
python-version: '3.8'
- os: 'windows-2016'
vs-toolset: '14.1'
python-version: '3.9'
fail-fast: false
steps:
- uses: actions/checkout@v2
name: Checkout the repository
with:
submodules: recursive
- name: Set Up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
architecture: 'x64'
architecture: x64
- name: Install Python dependencies
run: |
python -m pip install -U pip 'setuptools>=47.0.0,<48'
python -m pip install scons pypiwin32 numpy ruamel.yaml cython h5py pandas
- name: Build Cantera
run: |
scons build -j2 boost_inc_dir=%BOOST_ROOT_1_69_0% debug=n VERBOSE=y python_package=full ^
scons build -j2 boost_inc_dir=%BOOST_ROOT_1_72_0% debug=n VERBOSE=y python_package=full ^
msvc_version=${{ matrix.vs-toolset }} f90_interface=n
shell: cmd
- name: Test Cantera
Expand Down
2 changes: 1 addition & 1 deletion src/kinetics/RxnRates.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void Plog::validate(const std::string& equation)
if (k < 0) {
format_to(err_reactions,
"\nInvalid rate coefficient for reaction '{}'\n"
"at P = {:.5g}, T = {}\n",
"at P = {:.5g}, T = {:.1f}\n",
equation, std::exp(iter->first), T[i]);
}
}
Expand Down