From 692b7bf8670be0c451c38b4fe9aa5e2727c9b2ae Mon Sep 17 00:00:00 2001 From: ssun30 Date: Tue, 1 Oct 2024 14:53:36 -0400 Subject: [PATCH 1/2] CI/doc build uses Miniforge3 instead of Mambaforge Added changelog to the workflow file --- .github/workflows/CI.yml | 9 +++++---- .github/workflows/docs.yml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b9b8ed39ed..8be6798625 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,6 +25,7 @@ # 2023-07-17 - made it pass by default # 2023-07-21 - upload the regression results summary as artifact (for use as a comment on PRs) # 2023-07-31 - removed option to run from RMG-database with GitHub resuable workflows +# 2024-10-01 - deprecated Mambaforge with Miniforge3 for environment creation name: Continuous Integration @@ -62,11 +63,11 @@ jobs: uses: actions/checkout@v4 # configures the mamba environment manager and builds the environment - - name: Setup Mambaforge Python 3.7 + - name: Setup Miniforge Python 3.7 uses: conda-incubator/setup-miniconda@v3 with: environment-file: environment.yml - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest python-version: 3.7 activate-environment: rmg_env @@ -112,11 +113,11 @@ jobs: uses: actions/checkout@v4 # configures the mamba environment manager and builds the environment - - name: Setup Mambaforge Python 3.7 + - name: Setup Miniforge Python 3.7 uses: conda-incubator/setup-miniconda@v3 with: environment-file: environment.yml - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest python-version: 3.7 activate-environment: rmg_env diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8ef810f67f..43ab6b0ab1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -27,10 +27,10 @@ jobs: fetch-depth: 0 - 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 + miniforge-variant: Miniforge3 miniforge-version: latest python-version: 3.7 activate-environment: rmg_env From 3bb30152586c86bb3e541d5b5ff211ca08d239f3 Mon Sep 17 00:00:00 2001 From: ssun30 Date: Tue, 1 Oct 2024 20:21:05 -0400 Subject: [PATCH 2/2] Changed behavior of retrieving regression results Non-reference CIs will now download reference regression results from the most recent successful reference CI run in the past 15 days --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8be6798625..85a55fe20c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -219,16 +219,16 @@ jobs: - name : Find ID of Reference Results env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # this will search for the last successful execution of CI on main run: | - run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --limit 1 --json databaseId --jq '.[0].databaseId') + run_id=$(gh run list -R ReactionMechanismGenerator/RMG-Py --workflow="Continuous Integration" --branch main --limit 15 --json databaseId,conclusion --jq 'map(select(.conclusion == "success")) | .[0].databaseId') 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 + # download stable regression results run-id: ${{ env.CI_RUN_ID }} repository: ReactionMechanismGenerator/RMG-Py github-token: ${{ secrets.GITHUB_TOKEN }}