Changed CI to use macos-latest because 10.15 is no longer available.

Aquaveo · May 15, 2023 · 4e82907 · 4e82907
1 parent db6a36d
commit 4e82907
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/XmsInterp-CI.yaml b/.github/workflows/XmsInterp-CI.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest]
+        platform: [ubuntu-latest]
         python-version: ['3.10']
 
     steps:
@@ -39,13 +39,13 @@ jobs:
 # MAC
 # ----------------------------------------------------------------------------------------------
   mac:
-    name: Clang-11.0 (${{ matrix.build_type }}, ${{ matrix.python-version }}, Macos)
+    name: Clang-14.0 (${{ matrix.build_type }}, ${{ matrix.python-version }}, Macos)
     runs-on: ${{ matrix.platform }}
 
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-10.15]
+        platform: [macos-latest]
         python-version: ['3.10']
         build_type: [Release, Debug]
 
@@ -63,7 +63,7 @@ jobs:
       CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD_SECRET }}
       CONAN_REMOTES: https://conan.aquaveo.com
       CONAN_BUILD_TYPES: ${{ matrix.build_type }}
-      CONAN_APPLE_CLANG_VERSIONS: '11.0'
+      CONAN_APPLE_CLANG_VERSIONS: '14.0'
       # Aquapi Variables
       AQUAPI_USERNAME: ${{ secrets.AQUAPI_USERNAME_SECRET }}
       AQUAPI_PASSWORD: ${{ secrets.AQUAPI_PASSWORD_SECRET }}
@@ -85,13 +85,8 @@ jobs:
       - name: Install Python Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
+          pip install conan==1.60.0 conan-package-tools==0.39.0 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 Xcode
-      - name: Setup XCode
-        uses: sinoru/actions-setup-xcode@v2
-        with:
-          xcode-version: '11.6'
       # Setup Conan
       - name: Setup Conan Directory
         run: conan user
@@ -137,7 +132,7 @@ jobs:
       # Get the Release Data
       - name: Get Release
         id: git_release
-        uses: bruceadams/get-release@v1.2.1
+        uses: bruceadams/get-release@v1.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.AQUAVEO_GITHUB_TOKEN }}
         if: startsWith(github.ref, 'refs/tags/')
@@ -265,7 +260,7 @@ jobs:
       # Get the Release Data
       - name: Get Release
         id: git_release
-        uses: bruceadams/get-release@v1.2.1
+        uses: bruceadams/get-release@v1.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.AQUAVEO_GITHUB_TOKEN }}
         if: startsWith(github.ref, 'refs/tags/')
@@ -388,7 +383,7 @@ jobs:
       # Get the Release Data
       - name: Get Release
         id: git_release
-        uses: bruceadams/get-release@v1.2.1
+        uses: bruceadams/get-release@v1.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.AQUAVEO_GITHUB_TOKEN }}
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/_package/xms/interp/__init__.py b/_package/xms/interp/__init__.py
@@ -3,4 +3,4 @@
 from .api.interpolator import interpolate_to_grid  # NOQA: F401
 from .api.interpolator import interpolate_to_points  # NOQA: F401
 
-__version__ = '6.1.5'
+__version__ = '6.1.6'