From 57c5e8612d5d38f13134287e73c615792eb224d3 Mon Sep 17 00:00:00 2001
From: Duncan Macleod <macleoddm@cardiff.ac.uk>
Date: Mon, 6 Jan 2025 17:21:38 +0000
Subject: [PATCH] actions: restore conda pkg cache

---
 .github/workflows/build.yml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7550c205..48d2cba7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,26 +53,22 @@ jobs:
       with:
         fetch-depth: 0
 
-    # EG 13 Dec 2024: commenting out broken cache
-    # - name: Cache conda packages
-    #   uses: actions/cache@v4
-    #   env:
-    #     # increment to reset cache
-    #     CACHE_NUMBER: 0
-    #   with:
-    #     path: ~/conda_pkgs_dir
-    #     key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ env.CACHE_NUMBER }}
-    #     restore-keys: ${{ runner.os }}-conda-${{ matrix.python-version }}-
+    - name: Cache conda packages
+      uses: actions/cache@v4
+      env:
+        # increment to reset cache
+        CACHE_NUMBER: 0
+      with:
+        path: ~/conda_pkgs_dir
+        key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ env.CACHE_NUMBER }}
+        restore-keys: ${{ runner.os }}-conda-${{ matrix.python-version }}-
 
     - name: Configure conda
       uses: conda-incubator/setup-miniconda@v3
       with:
-        auto-update-conda: true
-        channels: conda-forge
+        activate-environment: test
+        miniforge-version: latest
         python-version: ${{ matrix.python-version }}
-        # this is needed for caching to work properly:
-        # EG 13 Dec 2024: commenting out broken cache
-        # use-only-tar-bz2: true
 
     - name: Conda info
       run: conda info --all