Skip to content

Commit 1c81279

Browse files
mjohnson541ssun30
authored andcommitted
TEMPORARY: set CI to use lithium_rebase branch
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.
1 parent 740ff9a commit 1c81279

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file contains the script used by GitHub actions to execute the Continuous Integration (CI)
33
# for RMG-Py. This includes building RMG and its dependencies, executing the unit tests,
44
# functional tests, database tests, and regression tests.
5-
#
5+
#
66
# This will run automatically on any push to any branch, but will only run one instance of
77
# itself at a time per branch (to avoid spawning tons of runners, which prevents them from
88
# executing).
@@ -14,7 +14,7 @@
1414
#
1515
#
1616
# Changelog:
17-
# 2023-04 - Jackson Burns - Added this header, regression tests, cleanup of action in
17+
# 2023-04 - Jackson Burns - Added this header, regression tests, cleanup of action in
1818
# in general, and documentation throughout the file.
1919
# 2023-05 - added Docker build steps
2020
# 2023-05-12 - added changes to allow running on forks
@@ -47,14 +47,19 @@ concurrency:
4747
env:
4848
# if running on RMG-Py but requiring changes on an un-merged branch of RMG-database, replace
4949
# main with the name of the branch
50-
RMG_DATABASE_BRANCH: main
50+
RMG_DATABASE_BRANCH: lithium_rebase
5151

5252

5353
jobs:
5454
build-osx:
5555
runs-on: macos-13
5656
# skip scheduled runs from forks
5757
if: ${{ !( github.repository != 'ReactionMechanismGenerator/RMG-Py' && github.event_name == 'schedule' ) }}
58+
env:
59+
# Update this if needed to match a pull request on the RMG-database:
60+
RMG_DATABASE_BRANCH: lithium_rebase
61+
# This is true only if this is a reference case for the regression testing:
62+
REFERENCE_JOB: ${{ github.ref == 'refs/heads/main' && matrix.os =='ubuntu-latest' && github.repository == 'ReactionMechanismGenerator/RMG-Py' }}
5863
defaults:
5964
run:
6065
shell: bash -l {0}
@@ -113,7 +118,7 @@ jobs:
113118
runs-on: ubuntu-latest
114119
# skip scheduled runs from forks
115120
if: ${{ !( github.repository != 'ReactionMechanismGenerator/RMG-Py' && github.event_name == 'schedule' ) }}
116-
env:
121+
env:
117122
# This is true only if this is a reference case for the regression testing:
118123
REFERENCE_JOB: ${{ github.ref == 'refs/heads/main' && github.repository == 'ReactionMechanismGenerator/RMG-Py' }}
119124
defaults:
@@ -175,7 +180,7 @@ jobs:
175180
timeout-minutes: 120 # this usually takes 20-45 minutes (or hangs for 6+ hours).
176181
run: |
177182
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
178-
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator'
183+
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="marcus_development")); using ReactionMechanismSimulator'
179184
180185
- name: Install Q2DTor
181186
run: echo "" | make q2dtor

0 commit comments

Comments
 (0)