Skip to content

Commit

Permalink
TEMPORARY: set CI to use lithium_rebase branch
Browse files Browse the repository at this point in the history
for RMG_database and marcus_development branch
for RMS

remove this commit before merging

*The marcus_development branch includes all the
commits necessary to make electrochemistry work
but doesn't include changes for the RMG-RMS
interface overhaul. Will be reverted once that
gets merged into RMS main.
  • Loading branch information
mjohnson541 authored and ssun30 committed Nov 6, 2024
1 parent 740ff9a commit 1c81279
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file contains the script used by GitHub actions to execute the Continuous Integration (CI)
# for RMG-Py. This includes building RMG and its dependencies, executing the unit tests,
# functional tests, database tests, and regression tests.
#
#
# This will run automatically on any push to any branch, but will only run one instance of
# itself at a time per branch (to avoid spawning tons of runners, which prevents them from
# executing).
Expand All @@ -14,7 +14,7 @@
#
#
# Changelog:
# 2023-04 - Jackson Burns - Added this header, regression tests, cleanup of action in
# 2023-04 - Jackson Burns - Added this header, regression tests, cleanup of action in
# in general, and documentation throughout the file.
# 2023-05 - added Docker build steps
# 2023-05-12 - added changes to allow running on forks
Expand Down Expand Up @@ -47,14 +47,19 @@ concurrency:
env:
# if running on RMG-Py but requiring changes on an un-merged branch of RMG-database, replace
# main with the name of the branch
RMG_DATABASE_BRANCH: main
RMG_DATABASE_BRANCH: lithium_rebase


jobs:
build-osx:
runs-on: macos-13
# skip scheduled runs from forks
if: ${{ !( github.repository != 'ReactionMechanismGenerator/RMG-Py' && github.event_name == 'schedule' ) }}
env:
# Update this if needed to match a pull request on the RMG-database:
RMG_DATABASE_BRANCH: lithium_rebase
# This is true only if this is a reference case for the regression testing:
REFERENCE_JOB: ${{ github.ref == 'refs/heads/main' && matrix.os =='ubuntu-latest' && github.repository == 'ReactionMechanismGenerator/RMG-Py' }}
defaults:
run:
shell: bash -l {0}
Expand Down Expand Up @@ -113,7 +118,7 @@ jobs:
runs-on: ubuntu-latest
# skip scheduled runs from forks
if: ${{ !( github.repository != 'ReactionMechanismGenerator/RMG-Py' && github.event_name == 'schedule' ) }}
env:
env:
# This is true only if this is a reference case for the regression testing:
REFERENCE_JOB: ${{ github.ref == 'refs/heads/main' && github.repository == 'ReactionMechanismGenerator/RMG-Py' }}
defaults:
Expand Down Expand Up @@ -175,7 +180,7 @@ jobs:
timeout-minutes: 120 # this usually takes 20-45 minutes (or hangs for 6+ hours).
run: |
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator'
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="marcus_development")); using ReactionMechanismSimulator'
- name: Install Q2DTor
run: echo "" | make q2dtor
Expand Down

0 comments on commit 1c81279

Please sign in to comment.