From 3b1c64508241f86d803d297483c670d29d8412d3 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Sat, 30 Sep 2023 17:38:09 -0700 Subject: [PATCH] Switch back to RMS main --- .github/workflows/CI.yml | 4 ++-- Dockerfile | 2 +- .../source/users/rmg/installation/anacondaDeveloper.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5a73b44dd4..fa18af19c9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -153,7 +153,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="for_rmg")); using ReactionMechanismSimulator' + julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator' - name: Install Q2DTor run: echo "" | make q2dtor @@ -381,4 +381,4 @@ jobs: uses: docker/build-push-action@v4 with: push: true - tags: reactionmechanismgenerator/rmg:latest \ No newline at end of file + tags: reactionmechanismgenerator/rmg:latest diff --git a/Dockerfile b/Dockerfile index ab9792b3ab..803374c02a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ ENV PATH="$RUNNER_CWD/RMG-Py:$PATH" # 1. Build RMG # 2. Install and link Julia dependencies for RMS RUN make && \ - julia -e 'using Pkg; Pkg.add(PackageSpec(name="PyCall",rev="master")); Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="for_rmg")); using ReactionMechanismSimulator' && \ + julia -e 'using Pkg; Pkg.add(PackageSpec(name="PyCall",rev="master")); Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator' && \ python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()" # RMG-Py should now be installed and ready - trigger precompilation and test run diff --git a/documentation/source/users/rmg/installation/anacondaDeveloper.rst b/documentation/source/users/rmg/installation/anacondaDeveloper.rst index 3fba6303b8..4a79244d0c 100644 --- a/documentation/source/users/rmg/installation/anacondaDeveloper.rst +++ b/documentation/source/users/rmg/installation/anacondaDeveloper.rst @@ -136,7 +136,7 @@ Installation by Source Using Anaconda Environment for Unix-based Systems: Linux #. Install and Link Julia dependencies: :: - julia -e 'using Pkg; Pkg.add("PyCall");Pkg.build("PyCall");Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="for_rmg")); using ReactionMechanismSimulator;' + julia -e 'using Pkg; Pkg.add("PyCall");Pkg.build("PyCall");Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator;' python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"