Skip to content

Commit f987e52

Browse files
committed
[CMake+CI] Use LLVM 13
Signed-off-by: AeroStun <24841307+AeroStun@users.noreply.github.com>
1 parent f217b2e commit f987e52

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
build-linux:
3030
name: arduino-prelude - Linux
3131
runs-on: ubuntu-latest
32-
container: ubuntu:bionic
32+
container: ubuntu:focal
3333
env:
3434
DEBIAN_FRONTEND: "noninteractive"
35-
CMAKE_VERSION: 3.21.1
35+
CMAKE_VERSION: 3.22.3
3636
CC: gcc-11
3737
CXX: g++-11
3838
steps:
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/cache@v2
5353
with:
5454
path: /opt/llvm_static
55-
key: ubuntu_bionic-llvm12.0
55+
key: ubuntu_focal-llvm13.0
5656
- name: Install LLVM
5757
if: steps.cache-llvm.outputs.cache-hit != 'true'
5858
run: |
@@ -78,18 +78,18 @@ jobs:
7878
name: arduino-prelude - macOS
7979
runs-on: macos-latest
8080
env:
81-
CC: clang-12
82-
CXX: clang++-12
81+
CC: clang-13
82+
CXX: clang++-13
8383
steps:
8484
- name: Get toolchain
8585
run: |
86-
brew install llvm@12 ninja zlib
86+
brew install llvm@13 ninja zlib
8787
- name: Cache LLVM
8888
id: cache-llvm
8989
uses: actions/cache@v2
9090
with:
9191
path: ~/llvm_static
92-
key: macos-llvm12.0
92+
key: macos-llvm13.0
9393
- name: Install LLVM
9494
if: steps.cache-llvm.outputs.cache-hit != 'true'
9595
run: |
@@ -127,7 +127,7 @@ jobs:
127127
uses: actions/cache@v2
128128
with:
129129
path: C:\llvm_static
130-
key: windows-llvm12.0
130+
key: windows-llvm13.0
131131
- name: Install LLVM
132132
if: steps.cache-llvm.outputs.cache-hit != 'true'
133133
run: |

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if (DEFINED SLIBCLANG_DIR)
6060
target_compile_options (arduino-prelude PUBLIC -Os -ffunction-sections -fdata-sections)
6161
endif ()
6262
else ()
63-
find_package (LLVM 12 REQUIRED CONFIG)
63+
find_package (LLVM 13 REQUIRED CONFIG)
6464
message (STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
6565
message (STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR} (${LLVM_INCLUDE_DIRS})")
6666

0 commit comments

Comments
 (0)