From 853d1e85280c747b44dc05e5ad9c434a0cd93686 Mon Sep 17 00:00:00 2001
From: Alpheus Madsen <alpheus.madsen@gmail.com>
Date: Mon, 7 Oct 2024 18:33:11 +0000
Subject: [PATCH] Change artifact and Mac OS version

Changed artifact from version 1 to version 4, and changed Mac OS from
latest to 13.

(cherry picked from commit 56d96349764b0c6b5fbadea2e1d2eb51b60ef81b)
---
 .github/workflows/XmsInterp-CI.yaml | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/XmsInterp-CI.yaml b/.github/workflows/XmsInterp-CI.yaml
index 7ca0d0f8..4ee883fd 100644
--- a/.github/workflows/XmsInterp-CI.yaml
+++ b/.github/workflows/XmsInterp-CI.yaml
@@ -3,9 +3,9 @@ name: XmsInterp-6
 on: [push, pull_request]
 
 jobs:
-# ----------------------------------------------------------------------------------------------
-# FLAKE
-# ----------------------------------------------------------------------------------------------
+  # ----------------------------------------------------------------------------------------------
+  # FLAKE
+  # ----------------------------------------------------------------------------------------------
   flake:
     name: Flake Project
     runs-on: ${{ matrix.platform }}
@@ -35,9 +35,9 @@ jobs:
         run: |
           flake8 --exclude .tox,.git,__pycache__,_package/tests/files/*,pydocs/source/conf.py,build,dist,tests/fixtures/*,*.pyc,*.egg-info,.cache,.eggs --ignore=D200,D212 --max-line-length=120 --docstring-convention google --isolated --import-order-style=appnexus --application-import-names=xms.interp --application-package-names=xms --count --statistics _package
 
-# ----------------------------------------------------------------------------------------------
-# MAC
-# ----------------------------------------------------------------------------------------------
+  # ----------------------------------------------------------------------------------------------
+  # MAC
+  # ----------------------------------------------------------------------------------------------
   mac:
     name: Clang-14.0 (${{ matrix.build_type }}, ${{ matrix.python-version }}, Macos)
     runs-on: ${{ matrix.platform }}
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest]
+        platform: [macos-13]
         python-version: ['3.10']
         build_type: [Release, Debug]
 
@@ -73,6 +73,10 @@ jobs:
       RELEASE_PYTHON: 'False'
 
     steps:
+      # Get Correct Version of Xcode
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 14.3.1
       # Checkout Sources
       - name: Checkout Source
         uses: actions/checkout@v2
@@ -148,9 +152,9 @@ jobs:
           asset_content_type: application/zip
         if: startsWith(github.ref, 'refs/tags/')
 
-# ----------------------------------------------------------------------------------------------
-# LINUX
-# ----------------------------------------------------------------------------------------------
+  # ----------------------------------------------------------------------------------------------
+  # LINUX
+  # ----------------------------------------------------------------------------------------------
   linux:
     name: GCC-${{ matrix.compiler-version }} (${{ matrix.build_type }}, ${{ matrix.python-version }}, Linux)
     runs-on: ${{ matrix.platform }}
@@ -202,7 +206,7 @@ jobs:
       - name: Install Python Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
+          pip install pyYAML==5.3.1  conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
           python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
       # Login to Aquaveo Docker
       - name: Login to Aquaveo Docker
@@ -276,9 +280,9 @@ jobs:
           asset_content_type: application/zip
         if: startsWith(github.ref, 'refs/tags/')
 
-# ----------------------------------------------------------------------------------------------
-# WINDOWS
-# ----------------------------------------------------------------------------------------------
+  # ----------------------------------------------------------------------------------------------
+  # WINDOWS
+  # ----------------------------------------------------------------------------------------------
   windows:
     name: Visual Studio ${{ matrix.compiler-version }} (${{ matrix.build_type }}, ${{ matrix.python-version }}, Windows)
     runs-on: ${{ matrix.platform }}
@@ -328,7 +332,7 @@ jobs:
       - name: Install Python Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
+          pip install pyYAML==5.3.1  conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
           python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
       # Setup Visual Studio
       - name: Setup Visual Studio