From 5a38af7800e6e566c4707988eea6a5ac1581976f Mon Sep 17 00:00:00 2001 From: 5cript Date: Sun, 7 Jul 2024 02:40:02 +0200 Subject: [PATCH 1/3] Updated git workflows. --- .github/workflows/build_and_test.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 80740373..79f29c4c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -24,16 +24,22 @@ jobs: packages: libcurl4-openssl-dev libcrypto++-dev ninja-build - name: Install boost - uses: MarkusJx/install-boost@v2.4.1 + uses: MarkusJx/install-boost@v2.4.5 id: install-boost with: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json - boost_version: 1.81.0 + boost_version: 1.83.0 # OPTIONAL: Specify a platform version platform_version: 22.04 + - name: Dump Tooling Versions + run: | + clang++ --version + cmake --version + ninja --version + - name: Configure CMake run: cmake -B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} -G"Ninja" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DROAR_BUILD_TESTS=on -DCMAKE_CXX_EXTENSIONS=on -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=lld -DCMAKE_CXX_STANDARD=20 env: @@ -56,13 +62,13 @@ jobs: packages: libcurl4-openssl-dev libcrypto++-dev ninja-build - name: Install boost - uses: MarkusJx/install-boost@v2.4.1 + uses: MarkusJx/install-boost@v2.4.5 id: install-boost with: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json - boost_version: 1.81.0 + boost_version: 1.83.0 # OPTIONAL: Specify a platform version platform_version: 20.04 From 30cd823aa46726af0bc0265fb7a27587b63632ab Mon Sep 17 00:00:00 2001 From: 5cript Date: Sun, 7 Jul 2024 02:49:09 +0200 Subject: [PATCH 2/3] Changed version check to cmake 3.30. --- cmake/dependencies/boost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/boost.cmake b/cmake/dependencies/boost.cmake index 79f9824d..5aa1b22a 100644 --- a/cmake/dependencies/boost.cmake +++ b/cmake/dependencies/boost.cmake @@ -1,4 +1,4 @@ -if (CMAKE_VERSION VERSION_LESS "3.29.0") +if (CMAKE_VERSION VERSION_LESS "3.30") find_package(Boost 1.81.0 REQUIRED COMPONENTS system) else() find_package(Boost CONFIG 1.81.0 REQUIRED COMPONENTS system) From d0d3df74118c15b8aa26fd35cc237a1023e10b7d Mon Sep 17 00:00:00 2001 From: 5cript Date: Sun, 7 Jul 2024 02:54:30 +0200 Subject: [PATCH 3/3] Update promise dependency. --- cmake/dependencies/xhawk18_promise.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/xhawk18_promise.cmake b/cmake/dependencies/xhawk18_promise.cmake index 004e6838..cdd318dc 100644 --- a/cmake/dependencies/xhawk18_promise.cmake +++ b/cmake/dependencies/xhawk18_promise.cmake @@ -3,7 +3,7 @@ set(PROMISE_MULTITHREAD on CACHE BOOL "Promise multithreading on") option(ROAR_EXTERNAL_PROMISE "Use an external promise library (provide it manually)" OFF) set(ROAR_PROMISE_GIT_REPOSITORY "https://github.com/5cript/promise-cpp.git" CACHE STRING "The URL from which to clone the promiselib repository") -set(ROAR_PROMISE_GIT_TAG "dfec4c3b579d721a85eb594484c5e4417977a030" CACHE STRING "The git tag or commit hash to checkout from the promiselib repository") +set(ROAR_PROMISE_GIT_TAG "bfad5bdd58f29465741858d826338e5b4ca65826" CACHE STRING "The git tag or commit hash to checkout from the promiselib repository") if (ROAR_EXTERNAL_PROMISE) else()