From e89a60584fa717382f279ae24b8a1a93d458bb4d Mon Sep 17 00:00:00 2001
From: John Andersen <johnandersenpdx@gmail.com>
Date: Thu, 23 Nov 2023 00:15:20 +0000
Subject: [PATCH] Enable 3.11 conda for bovine

Signed-off-by: John Andersen <johnandersenpdx@gmail.com>
---
 .github/workflows/ci.yml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e272a4fd..16bfa827 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,36 +11,38 @@ on:
   workflow_dispatch:
 
 jobs:
-  ci-venv:
-    name: CI (venv)
+  ci:
+    name: "CI ${{ matrix.python-version }} (conda: ${{ matrix.conda }})"
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        conda: [true, false]
         python-version: ["3.11"]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    - run: ./run-tests.sh
-  
-  ci-conda:
-    name: CI (conda)
-    runs-on: ubuntu-latest
     defaults:
       run:
         # https://github.com/conda-incubator/setup-miniconda#use-a-default-shell
         shell: bash -el {0}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: conda-incubator/setup-miniconda@v2
+      if: ${{ matrix.conda == true }}
       with:
         activate-environment: scitt
         environment-file: environment.yml
-    - run: |
+        python-version: ${{ matrix.python-version }}
+    - name: Run tests with conda
+      if: ${{ matrix.conda == true }}
+      run: |
         python -m pip install -e .
         python -m pytest
+    - name: Set up Python ${{ matrix.python-version }}
+      if: ${{ matrix.conda == false }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Run tests with venv
+      if: ${{ matrix.conda == false }}
+      run: ./run-tests.sh
 
   ci-cd-build-and-push-image-container:
     name: CI/CD (container)