From b3c3a77144ba185d302401f8a290584bfbf7604d Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:38:02 -0400 Subject: [PATCH 01/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac1df861fce..0792ed50408 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Reaction Mechanism Generator (RMG) +# Reaction Mechanism Generator (RMG) is Cool [![Codecov report](https://img.shields.io/codecov/c/github/ReactionMechanismGenerator/RMG-Py/main.svg)](https://codecov.io/gh/ReactionMechanismGenerator/RMG-Py) [![GitHub release](https://img.shields.io/github/release/ReactionMechanismGenerator/RMG-Py.svg)](https://github.com/ReactionMechanismGenerator/RMG-Py/releases) From 576e86b3b6106ae139f504dfd0e360ee1510e373 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Wed, 5 Jun 2024 10:26:21 -0400 Subject: [PATCH 02/10] try bumping upload-artifact version, switch to official download-artifact --- .github/workflows/CI.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 75deef06161..e3ac04c8724 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -185,7 +185,7 @@ jobs: # Upload Regression Results as Failed if above step failed - name: Upload Failed Results if: ${{ failure() && steps.regression-execution.conclusion == 'failure' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failed_regression_results path: | @@ -195,7 +195,7 @@ jobs: - name: Upload Results as Reference # upload the results for scheduled CI (on main) and pushes to main if: ${{ env.REFERENCE_JOB == 'true' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: stable_regression_results path: | @@ -204,7 +204,7 @@ jobs: # Upload Regression Results as Dynamic if Push to non-main Branch - name: Upload Results as Dynamic if: ${{ env.REFERENCE_JOB == 'false' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dynamic_regression_results path: | @@ -215,23 +215,17 @@ jobs: run: mkdir stable_regression_results # Retrieve Stable Results for reference - # Will need to use this -> https://github.com/dawidd6/action-download-artifact - name: Retrieve Stable Regression Results if: ${{ env.REFERENCE_JOB == 'false' }} - uses: dsnopek/action-download-artifact@91dda23aa09c68860977dd0ed11d93c0ed3795e7 # see https://github.com/ReactionMechanismGenerator/RMG-Py/pull/2459#issuecomment-1582850815 + uses: actions/download-artifact@v4 with: # this will search for the last successful execution of CI on main and download # the stable regression results - workflow: CI.yml - workflow_conclusion: success - repo: ReactionMechanismGenerator/RMG-Py - branch: main + # run-id: need this? + repository: ReactionMechanismGenerator/RMG-Py + github-token: ${{ secrets.GH_PAT }} name: stable_regression_results path: stable_regression_results - search_artifacts: true # retrieves the last run result, either scheduled daily or on push to main - ensure_latest: true # ensures that the latest run is retrieved - # should result in a set of folders inside stable_regression_results - # each of which has the stable result for that example/test # Regression Testing - Actual Comparisons - name: Regression Tests - Compare to Baseline From 81ecae63f217a1f90efcefd3d8842fddd38ad065 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:09:05 -0400 Subject: [PATCH 03/10] chatgpt said this would work --- .github/workflows/CI.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e3ac04c8724..9f3387ede2b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -215,13 +215,19 @@ jobs: run: mkdir stable_regression_results # Retrieve Stable Results for reference + - name : ChatGPT said this would work - Get most recent CI run ID + id: get-run-id + run: | + sudo apt-get install -y gh + run_id=$(gh run list -R ReactionMechanismGenerator/ReactionMechanismGenerator --workflow="Continuous Integration" --limit 1 --json run_id --jq '.[0].run_id') + echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV - name: Retrieve Stable Regression Results if: ${{ env.REFERENCE_JOB == 'false' }} uses: actions/download-artifact@v4 with: # this will search for the last successful execution of CI on main and download # the stable regression results - # run-id: need this? + run-id: ${{ env.CI_RUN_ID }} repository: ReactionMechanismGenerator/RMG-Py github-token: ${{ secrets.GH_PAT }} name: stable_regression_results From 3dece4c95e5dc817b6761adce801257af8dd7458 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:59:05 -0400 Subject: [PATCH 04/10] set token for gh cli, avoid pointless reinstall attempt --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9f3387ede2b..425b20447b2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -217,8 +217,9 @@ jobs: # Retrieve Stable Results for reference - name : ChatGPT said this would work - Get most recent CI run ID id: get-run-id + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - sudo apt-get install -y gh run_id=$(gh run list -R ReactionMechanismGenerator/ReactionMechanismGenerator --workflow="Continuous Integration" --limit 1 --json run_id --jq '.[0].run_id') echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV - name: Retrieve Stable Regression Results From 3ccdc313260ab9660b8391b5d1e3b55d92def05e Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:58:08 -0400 Subject: [PATCH 05/10] wrong field name --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 425b20447b2..82dbd9353a5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -220,7 +220,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - run_id=$(gh run list -R ReactionMechanismGenerator/ReactionMechanismGenerator --workflow="Continuous Integration" --limit 1 --json run_id --jq '.[0].run_id') + run_id=$(gh run list -R ReactionMechanismGenerator/ReactionMechanismGenerator --workflow="Continuous Integration" --limit 1 --json databaseId --jq '.[0].databaseId') echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV - name: Retrieve Stable Regression Results if: ${{ env.REFERENCE_JOB == 'false' }} From 928b24a6cf2ed0d2bf46d3239338e0ab8d279a98 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Thu, 6 Jun 2024 08:17:39 -0400 Subject: [PATCH 06/10] wow i can't believe i set the repo name incorrectly --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 82dbd9353a5..76502f38466 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -220,7 +220,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - run_id=$(gh run list -R ReactionMechanismGenerator/ReactionMechanismGenerator --workflow="Continuous Integration" --limit 1 --json databaseId --jq '.[0].databaseId') + run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --limit 1 --json databaseId --jq '.[0].databaseId') echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV - name: Retrieve Stable Regression Results if: ${{ env.REFERENCE_JOB == 'false' }} From b1da82c14b0855b4b4d2e369ea314d1d1ec009b1 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:12:58 -0400 Subject: [PATCH 07/10] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 76502f38466..c450f51aeed 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -220,7 +220,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --limit 1 --json databaseId --jq '.[0].databaseId') + run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --event schedule --limit 1 --json databaseId --jq '.[0].databaseId') echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV - name: Retrieve Stable Regression Results if: ${{ env.REFERENCE_JOB == 'false' }} From dbb57bbc3cc872fb69b450026ae765699d69b2dd Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:23:22 -0400 Subject: [PATCH 08/10] bump miniconda --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c450f51aeed..4214216ed12 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -63,7 +63,7 @@ jobs: # configures the mamba environment manager and builds the environment - name: Setup Mambaforge Python 3.7 - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: environment-file: environment.yml miniforge-variant: Mambaforge @@ -113,7 +113,7 @@ jobs: # configures the mamba environment manager and builds the environment - name: Setup Mambaforge Python 3.7 - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: environment-file: environment.yml miniforge-variant: Mambaforge From 8e069d8f305c4d91750f7cf8b821b05d20fb0a5a Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:04:40 -0400 Subject: [PATCH 09/10] run on macos-13 for conda compatibility --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4214216ed12..859c19188fb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,7 +51,7 @@ env: jobs: build-osx: - runs-on: macos-latest + runs-on: macos-13 # skip scheduled runs from forks if: ${{ !( github.repository != 'ReactionMechanismGenerator/RMG-Py' && github.event_name == 'schedule' ) }} defaults: From bffb858dc913d3ea157fa02fb1fe696b5feba7b0 Mon Sep 17 00:00:00 2001 From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:09:39 -0400 Subject: [PATCH 10/10] don't limit to scheduled runs on main - pushes are OK too --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 859c19188fb..fdf3a2c8db2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -220,7 +220,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --event schedule --limit 1 --json databaseId --jq '.[0].databaseId') + run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --limit 1 --json databaseId --jq '.[0].databaseId') echo "CI_RUN_ID=$run_id" >> $GITHUB_ENV - name: Retrieve Stable Regression Results if: ${{ env.REFERENCE_JOB == 'false' }}