Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use MacOS 15 instead of 12 on CI #51

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/conan_linuxmac_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:
description: "g++ clang++"
required: true
conan-compiler-version:
description: "A number [gcc: 8 9 10 11 12 13] [clang: 39 40 50 60 7 8 9 10 11 12 13] [10.0]"
description: "A number [gcc: 8 9 10 11 12 13 14 15] [clang: 39 40 50 60 7 8 9 10 11 12 13 14 15 16 177 18 19 20] [10.0]"
required: true
conan-libcxx-version:
description: "Linux: libstdc++ or Macos: libc++ "
Expand All @@ -39,7 +39,7 @@ runs:
- name: Install conan & build configuration
run: |
pip install wheel
pip install conan==1.64.0
pip install conan==1.66.0
pip install "markupsafe<2.1"
pip install -Iv cmake>=3.17
if [[ ${{ inputs.conan-build-os }} == "Linux" ]]; then sudo apt-get install -y ninja-build; fi
Expand Down
2 changes: 1 addition & 1 deletion .github/conan_windows_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
- name: Install conan & build configuration
run: |
pip install wheel
pip install conan==1.64.0
pip install conan==1.66.0
pip install "markupsafe<2.1"
pip install -Iv cmake>=3.17
pip install packaging
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,6 @@ jobs:
build-libcxx: libstdc++11
build-arch: x86_64

- name: Macos_xcode13.4
os: macos-12
build-compiler: apple-clang
build-cversion: 13
build-config: Release
build-os: Macos
build-xcode-version: 13.4
build-libcxx: libc++
build-arch: x86_64

- name: Macos_xcode14.3
os: macos-13
build-compiler: apple-clang
Expand All @@ -101,9 +91,19 @@ jobs:
build-libcxx: libc++
build-arch: armv8

- name: Macos_xcode16
os: macos-15
build-compiler: apple-clang
build-cversion: 16
build-config: Release
build-os: Macos
build-xcode-version: 16
build-libcxx: libc++
build-arch: armv8

steps:
- name: Checkout the source
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -113,7 +113,7 @@ jobs:
sudo xcode-select -switch /Applications/Xcode_${{matrix.build-xcode-version}}.app

- name: Setup python version
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from packaging import version
from pathlib import Path

required_conan_version = "~=1.64.0"
required_conan_version = "~=1.66.0"


class HDILibConan(ConanFile):
Expand Down
2 changes: 1 addition & 1 deletion test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps
import shutil

required_conan_version = "~=1.64.0"
required_conan_version = "~=1.66.0"

# This is a "hello world" type test that checks that the conan package can be consumed
# i.e. that that cmake support works, consumption of HDILib headers (compiler) and lib (linker) works
Expand Down
Loading