@@ -35,8 +35,15 @@ concurrency:
3535 cancel-in-progress : true
3636
3737env :
38- # update this to run tests with un merged rmg-py branches
39- RMG_PY_BRANCH : main
38+ # if running on RMG-Database but requiring changes on an un-merged branch of RMG-Py, replace
39+ # main with the name of the branch
40+ RMG_PYBRANCH : main
41+ # RMS branch to use for ReactionMechanismSimulator installation
42+ RMS_BRANCH : for_rmg
43+ # RMS mode used for install_rms.sh
44+ RMS_INSTALLER : continuous
45+ # julia parallel pre-compilation leads to race conditions and hangs, so we limit it to run in serial
46+ JULIA_NUM_PRECOMPILE_TASKS : 1
4047
4148jobs :
4249 build-and-test-linux :
@@ -64,39 +71,32 @@ jobs:
6471 path : RMG-database
6572
6673 # configures the mamba environment manager and builds the environment
67- - name : Setup Miniforge Python 3.9
74+ - name : Setup Miniforge Python 3.11
6875 uses : conda-incubator/setup-miniconda@v3
6976 with :
7077 environment-file : RMG-Py/environment.yml
7178 miniforge-variant : Miniforge3
7279 miniforge-version : latest
73- python-version : 3.9
80+ python-version : 3.11
7481 activate-environment : rmg_env
75- use-mamba : true
82+ auto-update-conda : true
83+ show-channel-urls : true
84+ conda-remove-defaults : " true"
7685
7786 # list the environment for debugging purposes
78- - name : mamba info
87+ - name : conda info
7988 run : |
80- mamba info
81- mamba list
82-
83- - name : Make libtiff Symlink to Avoid Runner Bug
84- run : | # This action may need to be removed/adjusted in future runs.
85- if [ ! -f /usr/lib/x86_64-linux-gnu/libtiff.so.5 ] && [ -f /usr/lib/x86_64-linux-gnu/libtiff.so.6 ]; then sudo ln -s /usr/lib/x86_64-linux-gnu/libtiff.so.6 /usr/lib/x86_64-linux-gnu/libtiff.so.5; fi
86- find /usr/lib -name libtiff*
87-
88- # modify env variables as directed in the RMG installation instructions
89- - name : Set Environment Variables
90- run : |
91- RUNNER_CWD=$(pwd)
92- echo "PYTHONPATH=$RUNNER_CWD/RMG-Py:$PYTHONPATH" >> $GITHUB_ENV
93- echo "$RUNNER_CWD/RMG-Py" >> $GITHUB_PATH
89+ conda info
90+ conda list
9491
9592 # RMG build step
9693 - name : make RMG
9794 run : |
98- make clean
99- make
95+ make install
96+
97+ - name : Make separate No-RMS conda env
98+ run : |
99+ conda create --name rmg_env_without_rms --clone rmg_env
100100
101101 - name : Setup Juliaup
102102 uses : julia-actions/install-juliaup@v2
@@ -164,7 +164,11 @@ jobs:
164164 GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
165165 # this will search for the last successful execution of CI on main
166166 run : |
167- run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --limit 15 --json databaseId,conclusion --jq 'map(select(.conclusion == "success")) | .[0].databaseId')
167+ run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --limit 60 --json databaseId,conclusion --jq 'map(select(.conclusion == "success")) | .[0].databaseId')
168+ if [ -z "$run_id" ] || [ "$run_id" = "null" ]; then
169+ echo "::error::No successful reference run found in last 60 runs."
170+ exit 1
171+ fi
168172 echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV
169173
170174 - name : Retrieve Stable Regression Results
@@ -185,6 +189,7 @@ jobs:
185189 env :
186190 REFERENCE : stable_regression_results
187191 run : |
192+ conda activate rmg_env_without_rms
188193 exec 2> >(tee -a regression.stderr >&2) 1> >(tee -a regression.stdout)
189194 mkdir -p "test/regression-diff"
190195 for regr_test in aromatics liquid_oxidation nitrogen oxidation sulfur superminimal RMS_constantVIdealGasReactor_superminimal RMS_CSTR_liquid_oxidation;
0 commit comments