Yet more github actions CI fixes. Also print more about clang failing to discover temporary file paths.

5 files changed, 13 insertions, 14 deletions

diff --git a/.ci.cmake b/.ci.cmake
index 63a45ade..6366670c 100644
--- a/.ci.cmake
+++ b/.ci.cmake
@@ -5,7 +5,7 @@ include(cmake/QuickCppLibBootstrap.cmake)
 include(QuickCppLibUtils)
 
 CONFIGURE_CTEST_SCRIPT_FOR_CDASH("llfio" "prebuilt")
-list(APPEND CTEST_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE} -DCXX_COROUTINES_FLAGS=)
+#list(APPEND CTEST_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE} -DCXX_COROUTINES_FLAGS=)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 include(FindGit)
 set(CTEST_GIT_COMMAND "${GIT_EXECUTABLE}")
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34d3746b..0b0a649f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,10 +38,10 @@ jobs:
          export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON";
        fi
        if [ "${{ matrix.compiler }}" = "arm-linux-gnueabihf-g++" ]; then
-         sudo apt install g++-arm-linux-gnueabihf;
-         ctest -S .ci.cmake -V --timeout 300 -DCTEST_DISABLE_TESTING=1 '-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-arm.cmake';
+         sudo apt install g++-8-arm-linux-gnueabihf;
+         ctest -S .ci.cmake -V --timeout 600 -DCTEST_DISABLE_TESTING=1 '-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-arm.cmake';
        else
-         ctest -S .ci.cmake -VV --timeout 300 '-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS';
+         ctest -S .ci.cmake -VV --timeout 600 '-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS';
        fi
       
     - name: Upload Prebuilt Binaries
@@ -76,7 +76,7 @@ jobs:
        if [ "${{ matrix.configuration }}" = "status_code" ]; then
          export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON"
        fi
-       ctest -S .ci.cmake -V -E noexcept --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS
+       ctest -S .ci.cmake -V -E noexcept --timeout 600 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS
       
     - name: Upload Prebuilt Binaries
       uses: actions/upload-artifact@v2
@@ -110,7 +110,7 @@ jobs:
        if [ "${{ matrix.configuration }}" = "status_code" ]; then
          export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON"
        fi
-       ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS
+       ctest -S .ci.cmake -V --timeout 600 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS
       
     - name: Upload Prebuilt Binaries
       uses: actions/upload-artifact@v2
diff --git a/cmake/toolchain-linux-arm.cmake b/cmake/toolchain-linux-arm.cmake
index 362e0f55..15973736 100644
--- a/cmake/toolchain-linux-arm.cmake
+++ b/cmake/toolchain-linux-arm.cmake
@@ -1,6 +1,5 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armhf)
-set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc-8)
+set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++-8)
 set(CMAKE_CXX_FLAGS_INIT "-Wno-attributes -Wno-psabi")
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp
index 02dd24e9..acdcd5a9 100644
--- 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    033288935037b61264e8cf74d17f51348403c72c
-#define LLFIO_PREVIOUS_COMMIT_DATE   "2020-11-04 17:24:16 +00:00"
-#define LLFIO_PREVIOUS_COMMIT_UNIQUE 03328893
+#define LLFIO_PREVIOUS_COMMIT_REF    e919b61352efdbf28a963ea81fcbea7ed4c7fd30
+#define LLFIO_PREVIOUS_COMMIT_DATE   "2020-11-10 12:24:36 +00:00"
+#define LLFIO_PREVIOUS_COMMIT_UNIQUE e919b613
diff --git a/include/llfio/v2.0/detail/impl/path_discovery.ipp b/include/llfio/v2.0/detail/impl/path_discovery.ipp
index 7ef716f7..74f2254c 100644
--- a/include/llfio/v2.0/detail/impl/path_discovery.ipp
+++ b/include/llfio/v2.0/detail/impl/path_discovery.ipp
@@ -159,7 +159,7 @@ namespace path_discovery
         auto _fh = file_handle::uniquely_named_file(ps._all[n].h, file_handle::mode::write, file_handle::caching::temporary, file_handle::flag::unlink_on_first_close);
         if(!_fh)
         {
-#if LLFIO_LOGGING_LEVEL >= 3
+#if LLFIO_LOGGING_LEVEL >= 3 || defined(__clang__)
           std::string msg("path_discovery::verified_temporary_directories() failed to create a file in ");
           msg.append(ps._all[n].path.string());
           msg.append(" due to ");
@@ -185,7 +185,7 @@ namespace path_discovery
         }
         else
         {
-#if LLFIO_LOGGING_LEVEL >= 3
+#if LLFIO_LOGGING_LEVEL >= 3 || defined(__clang__)
           std::string msg("path_discovery::verified_temporary_directories() failed to statfs the temp directory ");
           msg.append(ps._all[n].path.string());
           msg.append(" due to ");