undoing clang on intel mac; upgrading to MacOS15 on intel!

Author: CodeByDrescher

.github/workflows/cd.yml

@@ -9,8 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [windows-latest, ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest]
-        #platform: [windows-latest, windows-11-arm, ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest]
+        platform: [windows-latest, ubuntu-latest, ubuntu-24.04-arm, macos-15-intel, macos-latest]
+        #platform: [windows-latest, windows-11-arm, ubuntu-latest, ubuntu-24.04-arm, macos-15-intel, macos-latest]
 
     runs-on: ${{ matrix.platform }}
 
@@ -51,7 +51,7 @@ jobs:
           cp conan-profiles/CI-CD/Windows-ARM64_profile.txt $CONAN_HOME/profiles/default
 
       - name: Install MacOS dependencies <x86_64>
-        if: matrix.platform == 'macos-13'
+        if: matrix.platform == 'macos-15-intel'
         shell: bash
         run: |
           brew install llvm
@@ -101,18 +101,10 @@ jobs:
         run: |
           conan install . --output-folder build --build=missing -o include_messaging=False
 
-      - name: Install Dependencies through Conan on ARM MacOS
-        if: matrix.platform == 'macos-latest'
-        shell: bash
-        run: |
-          conan install . --output-folder build --build=missing
-
-      - name: Install Dependencies through Conan on Intel MacOS
-        if: matrix.platform == 'macos-13'
+      - name: Install Dependencies through Conan on MacOS
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'macos-15-intel'
         shell: bash
         run: |
-          CC=$(brew --prefix llvm)/bin/clang \
-          CXX=$(brew --prefix llvm)/bin/clang++ \
           conan install . --output-folder build --build=missing
 
       - name: Install Dependencies through Conan on Linux <x86_64>
@@ -149,32 +141,14 @@ jobs:
           cmake --build . --config Release
 
       - name: Build Non-Intel-Mac Unix
-        if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-latest'
+        if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-15-intel' || matrix.platform == 'macos-latest'
         run: |
           echo "working dir is $PWD"
           cd build
           source conanbuild.sh
           cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
 
-      - name: Build Intel Mac
-        if: matrix.platform == 'macos-13'
-        run: |
-          echo "working dir is $PWD"
-          cd build
-          source conanbuild.sh
-          CC=$(brew --prefix llvm)/bin/clang \
-          CXX=$(brew --prefix llvm)/bin/clang++ \
-          cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \
-            -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
-            -DCMAKE_AR=/usr/local/opt/llvm/bin/llvm-ar \
-            -DCMAKE_RANLIB=/usr/local/opt/llvm/bin/llvm-ranlib \
-            -DCMAKE_LINKER=/usr/local/opt/llvm/bin/ld.lld \
-            -DCMAKE_OSX_SYSROOT="" \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET=""
-          cmake --build . --config Release
-
       - name: Test Windows
         if: matrix.platform == 'windows-latest' || matrix.platform == 'windows-11-arm'
         run: |
@@ -183,7 +157,7 @@ jobs:
           ./bin/SundialsSolverStandalone_x64 || true
 
       - name: Test Unix
-        if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-13' || matrix.platform == 'macos-latest'
+        if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-15-intel' || matrix.platform == 'macos-latest'
         run: |
           cd build
 
@@ -194,7 +168,7 @@ jobs:
 
 
       - name: fix Macos shared object paths
-        if: matrix.platform == 'macos-13' || matrix.platform == 'macos-latest'
+        if: matrix.platform == 'macos-15-intel' || matrix.platform == 'macos-latest'
         shell: bash
         run: |
           mkdir build/upload
@@ -239,7 +213,7 @@ jobs:
           cd ../..
 
       - name: Upload Intel Macos binaries
-        if: matrix.platform == 'macos-13'
+        if: matrix.platform == 'macos-15-intel'
         uses: actions/upload-artifact@v4
         with:
           name: macos_x86_64.tgz

Dockerfile

@@ -2,7 +2,7 @@ FROM debian:bookworm-slim AS build
 SHELL ["/bin/bash", "-c"]
 
 RUN apt-get -y update && apt-get install -y apt-utils && apt-get remove --purge gcc
-RUN apt-get install -y -qq -o=Dpkg::Use-Pty=0 clang mold ninja-build cmake libc++-dev libc++abi-dev libcurl4-openssl-dev \
+RUN apt-get install -y -qq -o=Dpkg::Use-Pty=0 clang mold ninja-build cmake libc++-16-dev libc++abi-16-dev libcurl4-openssl-dev \
             git curl wget ca-certificates python3 python3-pip
 RUN rm $(which gcc) || true
 RUN rm $(which g++) || true

conan-profiles/CI-CD/MacOS-AMD64_profile.txt

@@ -1,11 +1,8 @@
 [settings]
 arch=x86_64
 build_type=Release
-compiler=clang
+compiler=apple-clang
 compiler.cppstd=20
 compiler.libcxx=libc++
 compiler.version=19
-os=Macos
-
-[conf]
-tools.build:compiler_executables={"c": "/usr/local/opt/llvm/bin/clang", "cpp": "/usr/local/opt/llvm/bin/clang++"}
+os=Macos