Move installability CI test to VS2022.

ned14 · Aug 22, 2024 · 3418726 · 3418726
1 parent dc08ec4
commit 3418726
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/.ci.cmake b/.ci.cmake
@@ -26,7 +26,6 @@ endif()
 ctest_build(TARGET _dl)
 ctest_build(TARGET _sl)
 set(retval 0)
-set(retval_cmake 0)
 if(NOT CTEST_DISABLE_TESTING)
   # shared_fs_mutex takes too long on CI
   # tls_socket_handle is unstable
@@ -35,15 +34,15 @@ if(NOT CTEST_DISABLE_TESTING)
   if(WIN32)
     # Azure's Windows version doesn't permit unprivileged creation of symbolic links
     if(CTEST_CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
-      ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink|process_handle")
+      ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink|process_handle")
     else()
-      ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink")
+      ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink")
     endif()
   elseif(APPLE)
     # Around Feb 2021 the Mac OS CI began failing pipe_handle and I don't have a Mac to diagnose
-    ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|pipe_handle")
+    ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|pipe_handle")
   else()
-    ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}")
+    ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}")
   endif()
 endif()
 if(WIN32)
@@ -184,20 +183,18 @@ else()
 endif()
 set(retval2 0)
 set(retval3 0)
-set(retval2_cmake 0)
-set(retval3_cmake 0)
 if(NOT CTEST_DISABLE_TESTING)
   if(("$ENV{CXX}" MATCHES "clang") OR ("$ENV{CXX}" MATCHES "g\\+\\+"))
     if("$ENV{CXX}" MATCHES "clang")
       ctest_build(TARGET _sl-asan)
       set(CTEST_CONFIGURATION_TYPE "asan")
-      ctest_test(RETURN_VALUE retval2 CAPTURE_CMAKE_ERROR retval2_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
+      ctest_test(RETURN_VALUE retval2 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
     else()
       set(retval2 0)
     endif()
     ctest_build(TARGET _sl-ubsan)
     set(CTEST_CONFIGURATION_TYPE "ubsan")
-    ctest_test(RETURN_VALUE retval3 CAPTURE_CMAKE_ERROR retval3_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
+    ctest_test(RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
   endif()
   merge_junit_results_into_ctest_xml()
 endif()
@@ -206,7 +203,7 @@ if(EXISTS "${toupload}")
 endif()
 ctest_submit()
 if(NOT retval EQUAL 0 OR NOT retval2 EQUAL 0 OR NOT retval3 EQUAL 0)
-  message(FATAL_ERROR "FATAL: Running tests exited with ${retval}-${retval_cmake} ${retval2}-${retval2_cmake} ${retval3}-${retval3_cmake}")
+  message(FATAL_ERROR "FATAL: Running tests exited with ${retval} ${retval2} ${retval3}")
 else()
-  message(STATUS "SUCCESS: Running tests exited with ${retval}-${retval_cmake} ${retval2}-${retval2_cmake} ${retval3}-${retval3_cmake}")
+  message(STATUS "SUCCESS: Running tests exited with ${retval} ${retval2} ${retval3}")
 endif()
diff --git a/.github/workflows/installability.yml b/.github/workflows/installability.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-2019]
+        os: [ubuntu-20.04, macos-latest, windows-2022]
         configuration: [error_code, status_code]
     env:
       NAME: Install-${{ matrix.os }}-${{ matrix.configuration }}

diff --git a/example/path_view_openat.cpp b/example/path_view_openat.cpp
@@ -33,6 +33,7 @@ namespace path_view_openat_example
   using namespace LLFIO_V2_NAMESPACE::windows_nt_kernel;
   using namespace std;
 
+  using LLFIO_V2_NAMESPACE::byte;
   using LLFIO_V2_NAMESPACE::windows_nt_kernel::IO_STATUS_BLOCK;
   using LLFIO_V2_NAMESPACE::windows_nt_kernel::NtCreateFile;
   using LLFIO_V2_NAMESPACE::windows_nt_kernel::OBJECT_ATTRIBUTES;
@@ -112,7 +113,7 @@ namespace path_view_openat_example
         return CreateFileA(zpath.c_str(), access, share, nullptr, creation,
                            flags, nullptr);
       }
-      else // char8_t, char16_t, wchar_t
+      else  // char8_t, char16_t, wchar_t
       {
         // Render to the system wide encoding null terminated
         auto zpath = path.render_null_terminated<wchar_t>(path);

diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp
@@ -1,4 +1,4 @@
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define LLFIO_PREVIOUS_COMMIT_REF    b2eef9e053c35ca7b8d7678169e578893b03fb9e
-#define LLFIO_PREVIOUS_COMMIT_DATE   "2024-08-22 12:11:35 +00:00"
-#define LLFIO_PREVIOUS_COMMIT_UNIQUE b2eef9e0
+#define LLFIO_PREVIOUS_COMMIT_REF    dc08ec4b231900c4236a0a6a493b6a30d91ae81a
+#define LLFIO_PREVIOUS_COMMIT_DATE   "2024-08-22 13:23:33 +00:00"
+#define LLFIO_PREVIOUS_COMMIT_UNIQUE dc08ec4b