From 04f29da805c15728c26c908cc2145f1e393a1945 Mon Sep 17 00:00:00 2001
From: Enrico Minack <github@enrico.minack.dev>
Date: Sat, 3 Feb 2024 17:57:29 +0100
Subject: [PATCH] Add macOS 14 to CI (#563)

---
 .github/workflows/ci-cd.yml   | 17 ++++++++++++++++-
 .github/workflows/publish.yml |  6 ++++++
 .github/workflows/test-os.yml | 13 ++++++++-----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index ec584696..7f8c1cea 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -34,19 +34,34 @@ jobs:
     name: "Test macOS"
     uses: "./.github/workflows/test-os.yml"
     with:
-      os: '["macos-11", "macos-12", "macos-13"]'
+      os: '["macos-11", "macos-12", "macos-13", "macos-14"]'
+      python-version: '["3.10", "3.11", "3.12.0-rc.3", "installed"]'
+      include: >
+        [
+          {"os": "macos-11", "python-version": "3.7"},
+          {"os": "macos-11", "python-version": "3.8"},
+          {"os": "macos-11", "python-version": "3.9"},
+          {"os": "macos-12", "python-version": "3.8"},
+          {"os": "macos-12", "python-version": "3.9"},
+          {"os": "macos-13", "python-version": "3.8"},
+          {"os": "macos-13", "python-version": "3.9"},
+        ]
 
   test-lnx:
     name: "Test Ubuntu"
     uses: "./.github/workflows/test-os.yml"
     with:
       os: '["ubuntu-20.04", "ubuntu-22.04"]'
+      python-version: '["3.8", "3.9", "3.10", "3.11", "3.12.0-rc.3", "installed"]'
+      include: '[{"os": "ubuntu-20.04", "python-version": "3.7"}]'
 
   test-win:
     name: "Test Windows"
     uses: "./.github/workflows/test-os.yml"
     with:
       os: '["windows-2019", "windows-2022"]'
+      python-version: '["3.8", "3.9", "3.10", "3.11", "3.12.0-rc.3", "installed"]'
+      include: '[{"os": "windows-2019", "python-version": "3.7"}]'
 
   publish:
     name: "Publish"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dd6574cb..0107727e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -241,6 +241,12 @@ jobs:
           - os: macos-11
             os-label: macOS 11
             python: "installed"
+          - os: macos-13
+            os-label: macOS 13
+            python: "installed"
+          - os: macos-14
+            os-label: macOS 14
+            python: "installed"
 
           - os: ubuntu-latest
             os-label: Linux
diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml
index 28482f2e..19b3af1b 100644
--- a/.github/workflows/test-os.yml
+++ b/.github/workflows/test-os.yml
@@ -6,6 +6,12 @@ on:
       os:
         required: true
         type: string
+      python-version:
+        required: true
+        type: string
+      include:
+        required: true
+        type: string
 jobs:
   test:
     name: Test (python-${{ matrix.python-version }}, ${{ matrix.os }})
@@ -14,11 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         os: ${{ fromJson(inputs.os) }}
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12.0-rc.3", "installed"]
-
-        include:
-          - os: ${{ fromJson(inputs.os)[0] }}
-            python-version: "3.7"
+        python-version: ${{ fromJson(inputs.python-version) }}
+        include: ${{ fromJson(inputs.include) }}
 
     steps:
       - name: Checkout