Skip to content

Commit 7b2296d

Browse files
committed
Merge branch 'feat/py39' of https://github.com/ReactionMechanismGenerator/RMG-Py into feat/py39
2 parents 0f87f76 + bff1865 commit 7b2296d

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

.github/workflows/CI.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ jobs:
8181
activate-environment: rmg_env
8282
use-mamba: true
8383

84+
- name: Fix ARM Mac environment
85+
if: matrix.os == 'macos-latest'
86+
run: |
87+
conda deactivate
88+
conda env remove -n rmg_env
89+
conda create -n rmg_env
90+
conda activate rmg_env
91+
conda config --env --set subdir osx-64
92+
conda env update -f environment.yml
93+
8494
# list the environment for debugging purposes
8595
- name: mamba info
8696
run: |
@@ -107,9 +117,18 @@ jobs:
107117
make
108118
109119
# Setup Juliaup
110-
- name: Set JULIAUP_DEPOT_PATH
120+
- name: Set Julia paths
111121
run: |
112122
echo "JULIAUP_DEPOT_PATH=$CONDA/envs/rmg_env/.julia" >> $GITHUB_ENV
123+
echo "JULIAUP_DEPOT_PATH=$CONDA/envs/rmg_env/.julia" >> $GITHUB_PATH
124+
echo "JULIA_DEPOT_PATH=$CONDA/envs/rmg_env/.julia" >> $GITHUB_ENV
125+
echo "JULIA_DEPOT_PATH=$CONDA/envs/rmg_env/.julia" >> $GITHUB_PATH
126+
echo "JULIA_CONDAPKG_EXE=$CONDA/condabin/mamba" >> $GITHUB_ENV
127+
echo "JULIA_CONDAPKG_EXE=$CONDA/condabin/mamba" >> $GITHUB_PATH
128+
echo "JULIA_CONDAPKG_EXE=$CONDA/condabin/mamba" >> $GITHUB_ENV
129+
echo "JULIA_CONDAPKG_EXE=$CONDA/condabin/mamba" >> $GITHUB_PATH
130+
echo "JULIA_CONDAPKG_BACKEND=Current" >> $GITHUB_ENV
131+
echo "JULIA_CONDAPKG_BACKEND=Current" >> $GITHUB_PATH
113132
114133
- name: Setup Juliaup
115134
uses: julia-actions/install-juliaup@v2
@@ -124,8 +143,7 @@ jobs:
124143
timeout-minutes: 120 # this usually takes 20-45 minutes (or hangs for 6+ hours).
125144
# JULIA_CONDAPKG_EXE points to the existing conda/mamba to avoid JuliaCall from installing their own. See https://juliapy.github.io/PythonCall.jl/stable/pythoncall/#If-you-already-have-a-Conda-environment.
126145
run: |
127-
export JULIA_CONDAPKG_EXE=$CONDA/condabin/mamba
128-
julia -e 'ENV["JULIA_CONDAPKG_BACKEND"] = "Current"; using Pkg; Pkg.add(Pkg.PackageSpec(name="ReactionMechanismSimulator", url="https://github.com/hwpang/ReactionMechanismSimulator.jl.git", rev="fix_installation")); using ReactionMechanismSimulator'
146+
julia -e 'using Pkg; Pkg.add(Pkg.PackageSpec(name="ReactionMechanismSimulator", url="https://github.com/hwpang/ReactionMechanismSimulator.jl.git", rev="fix_installation")); using ReactionMechanismSimulator'
129147
130148
- name: Install Q2DTor
131149
run: echo "" | make q2dtor

0 commit comments

Comments
 (0)