From 1bbe4b958c5d08f9a3b562299d2788487adf7922 Mon Sep 17 00:00:00 2001 From: Jackson Burns Date: Thu, 7 Mar 2024 13:03:34 -0500 Subject: [PATCH 1/4] update checkout version, remove unnessecary lines --- .github/workflows/CI.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d272feda78..ded6d65b51 100644 --- 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 From fc1916bda82fc813a49e01888daf4876ebc4a3cc Mon Sep 17 00:00:00 2001 From: Jackson Burns Date: Thu, 7 Mar 2024 13:06:13 -0500 Subject: [PATCH 2/4] allow git commit to fail without changes, skip push test --- .github/workflows/docs.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index aff19b7b83..aaf88211cf 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -81,7 +81,7 @@ jobs: cd build/html touch .nojekyll git add -A --force . - git commit -m "Automated documentation rebuild" + git commit -m "Automated documentation rebuild" || true # allow this to fail if no changes were made - name: Check documentation links continue-on-error: true @@ -89,12 +89,6 @@ jobs: 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: | From 6fcb526a03e8e80388fd9b3806dbf680c73ef38b Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:21:34 -0400 Subject: [PATCH 3/4] skip commit without changes but without hiding possible commit fails --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index aaf88211cf..972a313e32 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -81,7 +81,7 @@ jobs: cd build/html touch .nojekyll git add -A --force . - git commit -m "Automated documentation rebuild" || true # allow this to fail if no changes were made + git diff --exit-code --quiet || git commit -m "Automated documentation rebuild" # only commit if changes were made - name: Check documentation links continue-on-error: true From 2302c478805d378461f4a5f35544e87adca2cff0 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:52:09 -0400 Subject: [PATCH 4/4] comment from review - avoid skipping commit for new files --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 972a313e32..8ef810f67f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -81,7 +81,7 @@ jobs: cd build/html touch .nojekyll git add -A --force . - git diff --exit-code --quiet || git commit -m "Automated documentation rebuild" # only commit if changes were made + 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