From 31e10a3a541b47a39bbe4e6d6ad36d9c98e177e2 Mon Sep 17 00:00:00 2001 From: Althea Denlinger <67075698+altheaden@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:47:30 -0600 Subject: [PATCH] Tweak behaviors of build and release workflows (#847) --- .github/workflows/build_workflow.yml | 16 ++++++---------- .github/workflows/release_workflow.yml | 4 +--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index cbe3de14e..c9ce71ac6 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -10,13 +10,13 @@ on: workflow_dispatch: env: - CANCEL_OTHERS: true + CANCEL_OTHERS: false PATHS_IGNORE: '["**/README.md", "**/docs/**", "**/examples/**", "**/misc/**", "**/.vscode/**", "**/.github/pull_request_template.md", "**/.github/ISSUE_TEMPLATE"]' jobs: pre-commit-hooks: runs-on: ubuntu-latest - timeout-minutes: 2 + timeout-minutes: 5 steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master @@ -78,10 +78,8 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: "e3sm_diags_ci" - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest - use-mamba: true - mamba-version: "*" environment-file: conda-env/ci.yml channel-priority: strict auto-update-conda: true @@ -95,8 +93,8 @@ jobs: - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Check conda env run: | - mamba list - mamba info + conda list + conda info - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Run Unit Tests @@ -139,10 +137,8 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: "e3sm_diags_ci" - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest - use-mamba: true - mamba-version: "*" environment-file: conda-env/ci.yml channel-priority: strict auto-update-conda: true diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml index 0a6cc644e..20e8d3ef1 100644 --- a/.github/workflows/release_workflow.yml +++ b/.github/workflows/release_workflow.yml @@ -33,10 +33,8 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: "e3sm_diags_ci" - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest - use-mamba: true - mamba-version: "*" environment-file: conda-env/ci.yml channel-priority: strict auto-update-conda: true