diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 58df0880..380bbae5 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -143,6 +143,20 @@ jobs: std_format_support: "True", conan-config: "", } + - { + name: "Clang-18 on Apple M1 (arm64)", + os: macos-14, + compiler: + { + type: CLANG, + version: 18, + cc: "/opt/homebrew/opt/llvm@18/bin/clang-18", + cxx: "/opt/homebrew/opt/llvm@18/bin/clang++", + }, + lib: "libc++", + cxx_modules: "False", + std_format_support: "True" + } - { name: "Apple Clang 15", os: macos-13, @@ -196,8 +210,8 @@ jobs: shell: bash run: | sudo apt install -y g++-${{ matrix.config.compiler.version }} - - name: Install Clang - if: matrix.config.compiler.type == 'CLANG' + - name: Install Clang with apt + if: matrix.config.compiler.type == 'CLANG' && matrix.config.os != 'macos-14' shell: bash working-directory: ${{ env.HOME }} run: | @@ -205,8 +219,13 @@ jobs: chmod +x llvm.sh sudo ./llvm.sh ${{ matrix.config.compiler.version }} sudo apt install -y clang-tools-${{ matrix.config.compiler.version }} + - name: Install Clang using homebrew + if: matrix.config.compiler.type == 'CLANG' && matrix.config.os == 'macos-14' + shell: bash + run: | + brew install llvm@18 - name: Install Libc++ - if: matrix.config.compiler.type == 'CLANG' && matrix.config.lib == 'libc++' + if: matrix.config.compiler.type == 'CLANG' && matrix.config.lib == 'libc++' && matrix.config.os != 'macos-14' shell: bash run: | sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev