Skip to content

Commit

Permalink
wip(ci): update compilers to llvm 15 on macos
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperFola committed Mar 31, 2024
1 parent 0ac0153 commit 80ca896
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/setup-compilers/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
Expand Down
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 80ca896

Please sign in to comment.