From e543b1211d9e71eb2accf09d51f2e3497c432107 Mon Sep 17 00:00:00 2001
From: Althea Denlinger <altheaden@unm.edu>
Date: Thu, 12 Sep 2024 10:45:27 -0700
Subject: [PATCH] Tweak behaviors of build and release workflows

---
 .github/workflows/build_workflow.yml   | 14 +++++---------
 .github/workflows/release_workflow.yml |  4 +---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
index cbe3de14e..b94ad3709 100644
--- a/.github/workflows/build_workflow.yml
+++ b/.github/workflows/build_workflow.yml
@@ -16,7 +16,7 @@ env:
 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