nix/ci: add and enable llvm-17

Author: JakeHillion

.github/workflows/ci.yml

@@ -24,13 +24,13 @@ jobs:
         nix flake show --json \
           | jq -r '.packages."x86_64-linux" | keys[]' \
           | sed 's/^/.#/' \
-          | xargs nix build
+          | xargs nix build --print-build-logs
 
   build-test:
     runs-on: 16-core-ubuntu
     strategy:
       matrix:
-        llvm_version: [16]
+        llvm_version: [16, 17]
     steps:
     - uses: actions/[email protected]
     - uses: cachix/install-nix-action@v27

CMakeLists.txt

@@ -224,8 +224,8 @@ find_package(LLVM ${LLVM_REQUESTED_VERSION} REQUIRED CONFIG)
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
-if((${LLVM_VERSION_MAJOR} VERSION_LESS 16) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 16))
-  message(SEND_ERROR "Object Introspection currently requires LLVM version 16!")
+if((${LLVM_VERSION_MAJOR} VERSION_LESS 16) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 17))
+  message(SEND_ERROR "Object Introspection currently requires an LLVM version between 16 and 17!")
 endif()
 
 find_package(Clang REQUIRED CONFIG)
@@ -336,7 +336,7 @@ target_include_directories(oicore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 llvm_map_components_to_libnames(llvm_libs core native mcjit x86disassembler)
 target_link_libraries(oicore
-  codegen
+  oicodegen
 
   ${Boost_LIBRARIES}
   Boost::headers

flake.nix

@@ -116,11 +116,13 @@
           default = self.packages.${system}."oid-llvm${toString defaultLlvmVersion}";
 
           oid-llvm16 = mkOidPackage 16;
+          oid-llvm17 = mkOidPackage 17;
         };
         devShells = rec {
           default = self.devShells.${system}."oid-llvm${toString defaultLlvmVersion}";
 
           oid-llvm16 = mkOidDevShell 16;
+          oid-llvm17 = mkOidDevShell 17;
         };
 
         apps.default = {

oi/CMakeLists.txt

@@ -39,12 +39,12 @@ target_link_libraries(container_info
   toml
 )
 
-add_library(codegen
+add_library(oicodegen
   CodeGen.cpp
   FuncGen.cpp
   OICodeGen.cpp
 )
-target_link_libraries(codegen
+target_link_libraries(oicodegen
   container_info
   resources
   symbol_service

test/CMakeLists.txt

@@ -60,7 +60,7 @@ target_compile_definitions(test_type_graph PRIVATE
   TARGET_EXE_PATH="${CMAKE_CURRENT_BINARY_DIR}/integration/integration_test_target"
 )
 target_link_libraries(test_type_graph
-  codegen
+  oicodegen
   container_info
   type_graph
 
@@ -79,7 +79,7 @@ target_compile_definitions(test_clang_type_parser PRIVATE
   BUILD_DIR="${CMAKE_BINARY_DIR}"
 )
 target_link_libraries(test_clang_type_parser
-  codegen
+  oicodegen
   container_info
   type_graph
 
@@ -132,7 +132,7 @@ if (WITH_FLAKY_TESTS)
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
   set_tests_properties(integration_py PROPERTIES
-    TIMEOUT 90
+    TIMEOUT 120
     ENVIRONMENT "OID=$<TARGET_FILE:oid>"
   )
 endif()

test/integration/CMakeLists.txt

@@ -95,7 +95,7 @@ if (${THRIFT_FOUND})
 endif()
 
 if (DEFINED ENV{CI})
-  gtest_discover_tests(integration_test_runner EXTRA_ARGS "--verbose" "--preserve-on-failure")
+  gtest_discover_tests(integration_test_runner EXTRA_ARGS "--verbose" "--preserve-on-failure" "--output-on-failure" PROPERTIES TIMEOUT 90)
 else()
-  gtest_discover_tests(integration_test_runner)
+  gtest_discover_tests(integration_test_runner PROPERTIES TIMEOUT 90)
 endif()