Pin CI to macos-12 (#312)

* pin to macos-12 * Update conda_cron.yaml * Update ci.yaml * Update conda_cron.yaml * Update ci.yaml
OpenFreeEnergy · May 1, 2024 · 12bc644 · 12bc644
1 parent 2425b4c
commit 12bc644
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,5 +1,7 @@
 name: "CI"
 on:
+  # Allow for workflows to be manuallly triggered
+  workflow_dispatch:
   pull_request:
     branches:
       - main
@@ -20,22 +22,24 @@ defaults:
 
 jobs:
   tests:
-    runs-on: ${{ matrix.OS }}-latest
+    runs-on: ${{ matrix.OS }}
     name: "💻-${{matrix.os }} 🐍-${{ matrix.python-version }} 🗃️${{ matrix.pydantic-version }}"
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu']
+        os: ['ubuntu-latest']
         pydantic-version: [">1"]
         python-version:
           - "3.9"
           - "3.10"
           - "3.11"  
         include:
-          - os: "macos"
+            # Note: pinned to macos-12
+            # see https://github.com/OpenFreeEnergy/openfe/issues/842
+          - os: "macos-12"
             python-version: "3.11"
             pydantic-version: ">1"
-          - os: "ubuntu"
+          - os: "ubuntu-latest"
             python-version: "3.11"
             pydantic-version: "<2"
 

diff --git a/.github/workflows/conda_cron.yaml b/.github/workflows/conda_cron.yaml
@@ -1,5 +1,7 @@
 name: "conda_cron"
 on:
+  # Allow for manual trigger of workflow
+  workflow_dispatch:
   schedule:
     # At 07:00 UTC every day
     - cron: "0 7 * * *"
@@ -14,12 +16,14 @@ defaults:
 
 jobs:
   condacheck:
-    runs-on: ${{ matrix.OS }}-latest
+    runs-on: ${{ matrix.OS }}
     name: "daily conda check"
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu', 'macos']
+        # Note: pinned to macos-12
+        # see https://github.com/OpenFreeEnergy/openfe/issues/842
+        os: ['ubuntu-latest', 'macos-12']
         python-version:
           - "3.9"
           - "3.10"