diff --git a/.github/composite-actions/download-libraries/action.yml b/.github/composite-actions/download-libraries/action.yml index dd32e86f7..d05314283 100644 --- a/.github/composite-actions/download-libraries/action.yml +++ b/.github/composite-actions/download-libraries/action.yml @@ -21,6 +21,11 @@ inputs: description: 'Install boost built with clang' default: false + install-boost-brew-clang: + type: boolean + description: 'Install boost built with Homebrew Clang' + default: false + install-gcc: type: boolean description: 'Install GCC toolset (compiler and build tools)' @@ -116,6 +121,17 @@ runs: sudo ./b2 install --prefix=/usr shell: bash if: inputs.install-boost-clang != 'false' + - name: Install Boost built with Homebrew Clang + # b2 doesn't recognize custom compilers, so some trick is needed: + run: | + cd lib/boost + export PATH=$(brew --prefix llvm@17)/bin:$PATH + ./bootstrap.sh --prefix=/usr --with-toolset=clang + ./b2 clean + ./b2 toolset=clang cxxflags="-std=c++11 -stdlib=libc++" linkflags="-stdlib=libc++" + sudo ./b2 install --prefix=/usr + shell: bash + if: inputs.install-boost-brew-clang != 'false' - name: Download frozen uses: ./.github/composite-actions/download-library with: diff --git a/.github/workflows/core-tests.yml b/.github/workflows/core-tests.yml index 9a287e161..fb95cd046 100644 --- a/.github/workflows/core-tests.yml +++ b/.github/workflows/core-tests.yml @@ -101,9 +101,17 @@ jobs: - { BUILD_TYPE: Debug, SANITIZER : UB } steps: - uses: actions/checkout@v3 - - name: Download libraries - run: brew install llvm@17 make boost + - name: Download build system + run: brew install llvm@17 make shell: bash + - name: Download libraries + uses: ./.github/composite-actions/download-libraries + with: + install-gcc: false + install-clang: false + install-boost-gcc: false + install-boost-clang: false + install-boost-brew-clang: true - name: Download datasets uses: ./.github/composite-actions/download-datasets - name: Build