diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcaf3ce0b..098600db7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,9 +89,9 @@ jobs: artifact: "windows-msvc-22" } - { - os: macos-latest, name: "MacOS Clang 14", - artifact: "macos-clang-14", - compiler: clang, compiler_version: 14, sanitizers: "On" + os: macos-latest, name: "MacOS Clang 15", + artifact: "macos-clang-15", + compiler: clang, compiler_version: 15, sanitizers: "On" } steps: @@ -156,7 +156,7 @@ jobs: - { os: ubuntu-latest, name: "Ubuntu Clang 15", artifact: "ubuntu-clang-15" } - { os: ubuntu-latest, name: "Ubuntu GCC 13", artifact: "ubuntu-gcc-13" } - { os: windows-latest, name: "Windows VS 2022", artifact: "windows-msvc-22", } - - { os: macos-latest, name: "MacOS Clang 14", artifact: "macos-clang-14", } + - { os: macos-latest, name: "MacOS Clang 15", artifact: "macos-clang-15", } steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/setup-compilers/action.yaml b/.github/workflows/setup-compilers/action.yaml index cea3cee8f..d42ad1aed 100644 --- a/.github/workflows/setup-compilers/action.yaml +++ b/.github/workflows/setup-compilers/action.yaml @@ -26,8 +26,8 @@ runs: shell: bash run: | if [[ '${{ startsWith(inputs.os_name, 'macos') }}' == 'true' ]]; then - echo "cc=${{ inputs.compiler }}" >> $GITHUB_OUTPUT - echo "cxx=${{ inputs.compiler }}++" >> $GITHUB_OUTPUT + echo "cc=/usr/local/opt/llvm@${{ inputs.compiler_version }}/bin/${{ inputs.compiler }}" >> $GITHUB_OUTPUT + echo "cxx=/usr/local/opt/llvm@${{ inputs.compiler_version }}/bin/${{ inputs.compiler }}++" >> $GITHUB_OUTPUT elif [[ '${{ inputs.compiler }}' == 'clang' ]]; then echo "cc=clang-${{ inputs.compiler_version }}" >> $GITHUB_OUTPUT echo "cxx=clang++-${{ inputs.compiler_version }}" >> $GITHUB_OUTPUT @@ -51,6 +51,12 @@ runs: libc++-${{ inputs.compiler_version }}-dev libc++abi-${{ inputs.compiler_version }}-dev \ clang-tools-${{ inputs.compiler_version }} + - name: Update LLVM compilers + if: startsWith(inputs.os_name, 'macos') + shell: bash + run: | + brew install llvm@${{ inputs.compiler_version }} + - name: Setup Windows environment uses: ilammy/msvc-dev-cmd@v1 if: startsWith(inputs.os_name, 'windows') diff --git a/CMakeLists.txt b/CMakeLists.txt index a63ed24b6..ddeee842a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,10 +109,6 @@ target_include_directories(ArkReactor target_link_libraries(ArkReactor PUBLIC termcolor) if (UNIX OR LINUX) - if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG) - target_link_libraries(ArkReactor PUBLIC stdc++fs) - endif() - find_package(Threads) target_link_libraries(ArkReactor PRIVATE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) endif()