From e304a89958522289962ae6dc38346d8d472dced5 Mon Sep 17 00:00:00 2001 From: ssun30 Date: Fri, 25 Oct 2024 15:18:43 -0400 Subject: [PATCH] Changed RMS branch to for_rmg For: >> Continuous Integration >> Documentations for compiling from source >> Building the Docker image *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. --- .github/workflows/CI.yml | 4 +++- .github/workflows/docs.yml | 2 +- .../source/users/rmg/installation/anacondaDeveloper.rst | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 19ae1ea7c7..4e2cc7a77d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -175,7 +175,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="for_rmg")); using ReactionMechanismSimulator' - name: Install Q2DTor run: echo "" | make q2dtor @@ -405,3 +405,5 @@ jobs: with: push: true tags: reactionmechanismgenerator/rmg:latest + build-args: | + RMS_Branch=for_rmg diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 43ab6b0ab1..ef3509d78f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -64,7 +64,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="for_rmg")); using ReactionMechanismSimulator' - name: Checkout gh-pages Branch uses: actions/checkout@v2 diff --git a/documentation/source/users/rmg/installation/anacondaDeveloper.rst b/documentation/source/users/rmg/installation/anacondaDeveloper.rst index 7dbcfb6677..e1aed5f7db 100644 --- a/documentation/source/users/rmg/installation/anacondaDeveloper.rst +++ b/documentation/source/users/rmg/installation/anacondaDeveloper.rst @@ -117,7 +117,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="main")); using ReactionMechanismSimulator;' + julia -e 'using Pkg; Pkg.add("PyCall");Pkg.build("PyCall");Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="for_rmg")); using ReactionMechanismSimulator;' python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"