Skip to content

Commit

Permalink
Changed CI to use macos-latest because 10.15 is no longer available.
Browse files Browse the repository at this point in the history
  • Loading branch information
bdolinar authored and wdolinar committed May 15, 2023
1 parent 27da961 commit 415af77
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/XmsStamper-CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [macos-10.15]
platform: [ubuntu-latest]
python-version: ['3.10']

steps:
Expand All @@ -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]

Expand All @@ -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 }}
Expand All @@ -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/[email protected]
with:
xcode-version: '11.6'
# Setup Conan
- name: Setup Conan Directory
run: conan user
Expand Down
2 changes: 1 addition & 1 deletion _package/xms/stamper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from . import stamping # NOQA: F401
from .api.stamp import stamp # NOQA: F401

__version__ = '6.0.5'
__version__ = '6.0.6'

0 comments on commit 415af77

Please sign in to comment.