Switch to macos-15

Author: howetuft

.github/workflows/build.yml

@@ -28,8 +28,9 @@ jobs:
     strategy:
       fail-fast: False
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
-        #os: [macos-15-intel, macos-15]
+        #os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
+        #os: [ubuntu-latest, macos-15-intel, macos-15]
+        os: [macos-15]
     env:
       BUILD_TYPE: Release
       # SANITIZE: true # uncomment to sanitize
@@ -173,13 +174,45 @@ jobs:
               arch='x86_64';
             }
             else {
-              target = '12.0';
+              target = '15.0';
               arch='armv8';
             }
             core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
             core.exportVariable('CMAKE_OSX_DEPLOYMENT_TARGET', target);
             core.exportVariable('PKG_ARCH', arch);
 
+      - name: Prepare MacOS (set build tools)
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+            # We make conan believe we use apple-clang (see profiles), but
+            # actually we use recent version of llvm, to get full compatibility
+            # with C++20
+            brew install llvm@20
+            LLVM_PREFIX=$(brew --prefix llvm@20)
+            echo "LLVM_PREFIX=${LLVM_PREFIX}" >> $GITHUB_ENV
+            echo "CC=${LLVM_PREFIX}/bin/clang" >> $GITHUB_ENV
+            echo "CXX=${LLVM_PREFIX}/bin/clang++" >> $GITHUB_ENV
+            echo "AR=${LLVM_PREFIX}/bin/llvm-ar" >> $GITHUB_ENV
+            echo "RANLIB=${LLVM_PREFIX}/bin/llvm-ranlib" >> $GITHUB_ENV
+            echo "DYLD_LIBRARY_PATH=${LLVM_PREFIX}/lib:${DYLD_LIBRARY_PATH}" >> $GITHUB_ENV
+
+            brew install lld@20
+            LLD_PREFIX=$(brew --prefix lld@20)
+            echo "LLD_PREFIX=${LLD_PREFIX}" >> $GITHUB_ENV
+            echo "LD=${LLD_PREFIX}/bin/ld.lld" >> $GITHUB_ENV
+            echo "LDFLAGS=-L${LLD_PREFIX}/lib" >> $GITHUB_ENV
+            echo "CXXFLAGS=-I${LLD_PREFIX}/include -fuse-ld=lld" >> $GITHUB_ENV
+            echo "CFLAGS=-I${LLD_PREFIX}/include -fuse-ld=lld" >> $GITHUB_ENV
+
+            echo "PATH=${LLVM_PREFIX}/bin:${LLD_PREFIX}/bin:${PATH}" >> $GITHUB_ENV
+
+            brew install libomp
+            echo "OpenMP_ROOT=$(brew --prefix libomp)" >> $GITHUB_ENV
+
+            brew install ispc
+            brew install gsed
+
       #***********************************#
       # Build steps (one per platform...) #
       #***********************************#
@@ -196,7 +229,6 @@ jobs:
         if: runner.os == 'macOS'
         shell: bash
         run: |
-            brew install ispc
             bash ${{ env.WORKSPACE }}/run-conan.sh
 
       - name: Build (Linux)
@@ -402,10 +434,10 @@ jobs:
           path: conan-cache
           key: deps-${{ matrix.os }}-${{ github.run_id }}
 
-      ## For debugging
-      #- name: Setup tmate session (debug)
-        #if: ${{ failure() }}
-        #uses: mxschmitt/action-tmate@v3
+      # For debugging
+      - name: Setup tmate session (debug)
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
 
       # Upload artifacts
       - uses: actions/upload-artifact@v4

conan-profiles/conan-profile-macOS-ARM64

@@ -2,24 +2,33 @@ include(conan-profile-common)
 
 [settings]
 os=Macos
+# TODO
 # 14.2 is required by opensubdiv for metal
-os.version=14.2
+#os.version=15.6
 arch=armv8
-compiler=apple-clang
-compiler.version=15
+compiler=clang
+compiler.version=20
 compiler.cppstd={{ os.getenv("CXX_VERSION") }}
 compiler.libcxx=libc++
 
+#TODO
+#compiler=apple-clang
+#compiler.version=16.0
+#compiler.cppstd={{ os.getenv("CXX_VERSION") }}
+#compiler.libcxx=libc++
+
 [options]
 boost/*:without_stacktrace=True
 boost/*:without_locale=True
 minizip-ng/*:with_zlib=True
 minizip-ng/*:with_libcomp=False
 embree/*:shared=True
 
-[buildenv]
-CXX=clang++
-CC=clang
+#[buildenv]
+#CXX=clang++
+#CC=clang
 
 [conf]
-&:tools.build:cxxflags=["-O3"]
+&:tools.build:cxxflags+=["-O3"]
+tools.build:cxxflags+=["-fuse-ld=lld"]
+tools.build:cflags+=["-fuse-ld=lld"]

conan-profiles/conan-profile-macOS-X64

@@ -2,10 +2,10 @@ include(conan-profile-common)
 
 [settings]
 os=Macos
-os.version=10.15
+#os.version=15.6
 arch=x86_64
 compiler=apple-clang
-compiler.version=14.0
+compiler.version=16.0
 compiler.cppstd={{ os.getenv("CXX_VERSION") }}
 compiler.libcxx=libc++
 
@@ -21,9 +21,10 @@ openvdb/*:simd=AVX
 opensubdiv/*:with_metal=False
 embree/*:shared=True
 
-[buildenv]
-CXX=clang++
-CC=clang
+# TODO
+#[buildenv]
+#CXX=clang++
+#CC=clang
 
 [conf]
 &:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]

conanfile.py

@@ -48,8 +48,8 @@ class LuxCoreDeps(ConanFile):
     channel = "luxcore"
 
     requires = [
-        f"openvdb/{OPENVDB_VERSION}",
         f"embree/{EMBREE_VERSION}",
+        f"openvdb/{OPENVDB_VERSION}",
         f"oidn/{OIDN_VERSION}@luxcore/luxcore",
         f"opensubdiv/{OPENSUBDIV_VERSION}",
         f"openimageio/{OIIO_VERSION}",

run-conan.sh

@@ -48,6 +48,12 @@ git clean -df  # cleans any untracked files/folders
 cd ..
 conan remote add mycenter ./conan-center-index
 
+# Patch ocio (MacOS)
+if [[ "$RUNNER_OS" == "macOS" ]]; then
+  gsed -i 's/self\.settings\.compiler\.libcxx == "libc++"/False/g' \
+    conan-center-index/recipes/opencolorio/all/conanfile.py
+fi
+
 # 2. Add local recipe repository (as a remote)
 conan remote add mylocal ./local-conan-recipes
 conan list -r mylocal
@@ -83,6 +89,8 @@ echo "::group::CIBW_BEFORE_BUILD: Install tool requirements"
 # We specify conancenter as a remote, thus allowing to use precompiled
 # binaries.
 # For pkgconf and meson, we have to manually target the right version
+# For b2, we need to build, otherwise we get the following error on Linux:
+# 'b2: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.29' not found (required by b2)'
 build_deps=(b2/[*] cmake/[*] m4/[*] pkgconf/2.1.0 meson/1.2.2 yasm/[*])
 if [[ $RUNNER_OS == "Windows" ]]; then
   build_deps+=(msys2/[*])