From 93cb2ec0e6ea609ad7373b1298434780cb8a28d5 Mon Sep 17 00:00:00 2001
From: Mike Alfare <13974384+mikealfare@users.noreply.github.com>
Date: Fri, 8 Nov 2024 16:28:23 -0500
Subject: [PATCH] move github runner from macos-12 to macos-14 (#941, #942,
 #943) (#946)

* move github runner from macos-12 to macos-14 (#941)

(cherry picked from commit d024eaf34a568d2447e97bc113703b5690897b04)

* test macos-14 on py310 instead of py39 due to missing psycopg2-binary (#942)

(cherry picked from commit fa4d72c5dcdb0b36552ca8fcf2ef8f27f471ded9)

* matrix entries need to be an array, even with only one value (#943)

(cherry picked from commit 1943ac543bdc0e448843205bf8e2e0469e933ef9)

---------

Co-authored-by: Colin Rogers <111200756+colin-rogers-dbt@users.noreply.github.com>
---
 .github/workflows/integration.yml | 11 ++++++-----
 .github/workflows/main.yml        |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index e83c4047c..a8b57c011 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -67,13 +67,14 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        os: [ubuntu-22.04, macos-12, windows-2022]
-        python-version: ["3.9"]
+        os: [ubuntu-22.04]
+        python-version: ["3.9", "3.10", "3.11"]
         include:
-          - os: ubuntu-22.04
+          # psycopg2-binary doesn't have a precompiled wheel for python 3.9 for macos-14
+          - os: macos-14
             python-version: "3.10"
-          - os: ubuntu-22.04
-            python-version: "3.11"
+          - os: windows-2022
+            python-version: "3.9"
 
     env:
       TOXENV: integration-redshift
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3d1e56f31..6612b4af4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -173,8 +173,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-14, windows-2022]
         python-version: ['3.9', '3.10', '3.11']
+        exclude:
+          # psycopg2-binary doesn't have a precompiled wheel for python 3.9 for mac
+          - os: macos-14
+            python-version: '3.9'
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}