From c0adf0a2d8fb6306ff5baec5e8cd070a3bcad186 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 17:45:01 +0100 Subject: [PATCH 1/7] Update build.yml --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b320184..58edb51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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.2 + build-libcxx: libc++ + build-arch: armv8 + steps: - name: Checkout the source - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive @@ -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" From e0748280de2d1262a62490288956ff1fff189670 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 19:42:15 +0100 Subject: [PATCH 2/7] Update action.yml --- .github/conan_linuxmac_build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/conan_linuxmac_build/action.yml b/.github/conan_linuxmac_build/action.yml index 0ac9675..8df2739 100644 --- a/.github/conan_linuxmac_build/action.yml +++ b/.github/conan_linuxmac_build/action.yml @@ -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++ " From 684e2c7774c2a2c9bda43c59e97e1e6dd7ab95d6 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 19:44:44 +0100 Subject: [PATCH 3/7] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58edb51..0ef1b59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,7 @@ jobs: build-cversion: 16 build-config: Release build-os: Macos - build-xcode-version: 16.2 + build-xcode-version: 16 build-libcxx: libc++ build-arch: armv8 From 06f19f238df61bb74c20e1346c84e9b0824d0b74 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 19:47:18 +0100 Subject: [PATCH 4/7] Update action.yml --- .github/conan_linuxmac_build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/conan_linuxmac_build/action.yml b/.github/conan_linuxmac_build/action.yml index 8df2739..84c1edb 100644 --- a/.github/conan_linuxmac_build/action.yml +++ b/.github/conan_linuxmac_build/action.yml @@ -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 From 0bd654363189ed9cbfb824c9a8d54952bfd05ad4 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 19:48:37 +0100 Subject: [PATCH 5/7] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 56b57ec..77c837a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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): From 6825e97457c2fdfc593ce9dcab74325a84680e61 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 19:50:20 +0100 Subject: [PATCH 6/7] Update action.yml --- .github/conan_windows_build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/conan_windows_build/action.yml b/.github/conan_windows_build/action.yml index 117ee74..1deb3ba 100644 --- a/.github/conan_windows_build/action.yml +++ b/.github/conan_windows_build/action.yml @@ -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 From a11fb14f296b231fde3661da20d555a6f672954c Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 18 Dec 2024 19:50:34 +0100 Subject: [PATCH 7/7] Update conanfile.py --- test_package/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 5855e7c..aee6601 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -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