Merge pull request #2628 from JacksonBurns/small-ci-patches

GitHub Actions Maintenance
ReactionMechanismGenerator · Mar 15, 2024 · ff318fc · ff318fc
2 parents 22f5930 + 2302c47
commit ff318fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -59,7 +59,7 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout RMG-Py
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # configures the mamba environment manager and builds the environment
       - name: Setup Mambaforge Python 3.7
@@ -109,11 +109,9 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout RMG-Py
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # configures the mamba environment manager and builds the environment
-      - name: Patch Environment File
-        run: sed -i 's/  - conda-forge::julia>=1.8.5,!=1.9.0/  - conda-forge::julia=1.9.1/' environment.yml
       - name: Setup Mambaforge Python 3.7
         uses: conda-incubator/setup-miniconda@v2
         with:
@@ -132,7 +130,6 @@ jobs:
 
       # Clone RMG-database
       - name: Clone RMG-database
-        if: github.repository != 'ReactionMechanismGenerator/RMG-database'
         run: |
           cd ..
           git clone -b $RMG_DATABASE_BRANCH https://github.com/ReactionMechanismGenerator/RMG-database.git

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -81,20 +81,14 @@ jobs:
           cd build/html
           touch .nojekyll
           git add -A --force .
-          git commit -m "Automated documentation rebuild"
+          git diff --staged --exit-code --quiet || git commit -m "Automated documentation rebuild"  # only commit if changes were made
 
       - name: Check documentation links
         continue-on-error: true
         run: |
           cd documentation
           sphinx-build -b linkcheck -d build/doctrees/ source/ build/linkcheck | grep -e broken -e redirect | grep -v -e 'redirect  https://doi.org/' -e 'broken    https://doi.org/.* 403 Client Error: Forbidden'
 
-      - name: Test Publish Documentation
-        if: ${{  github.event_name != 'push' && github.repository == 'ReactionMechanismGenerator/RMG-Py' }}
-        run: |
-          cd documentation/build/html
-          git push --dry-run origin gh-pages
-
       - name: Publish Updated Documentation
         if: ${{  github.event_name == 'push' && github.repository == 'ReactionMechanismGenerator/RMG-Py' }}
         run: |