Skip to content

Commit d0ac200

Browse files
committed
nix/ci: add and enable llvm-18
1 parent 3fc72bf commit d0ac200

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: 16-core-ubuntu
3131
strategy:
3232
matrix:
33-
llvm_version: [16, 17]
33+
llvm_version: [16, 17, 18]
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: cachix/install-nix-action@v27

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ find_package(LLVM ${LLVM_REQUESTED_VERSION} REQUIRED CONFIG)
224224
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
225225
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
226226

227-
if((${LLVM_VERSION_MAJOR} VERSION_LESS 16) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 17))
228-
message(SEND_ERROR "Object Introspection currently requires an LLVM version between 16 and 17!")
227+
if((${LLVM_VERSION_MAJOR} VERSION_LESS 16) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 18))
228+
message(SEND_ERROR "Object Introspection currently requires an LLVM version between 16 and 18!")
229229
endif()
230230

231231
find_package(Clang REQUIRED CONFIG)

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,14 @@
117117

118118
oid-llvm16 = mkOidPackage 16;
119119
oid-llvm17 = mkOidPackage 17;
120+
oid-llvm18 = mkOidPackage 18;
120121
};
121122
devShells = rec {
122123
default = self.devShells.${system}."oid-llvm${toString defaultLlvmVersion}";
123124

124125
oid-llvm16 = mkOidDevShell 16;
125126
oid-llvm17 = mkOidDevShell 17;
127+
oid-llvm18 = mkOidDevShell 18;
126128
};
127129

128130
apps.default = {

0 commit comments

Comments
 (0)