From a1352ef8469344953b7dada7164504a5bf85f10c Mon Sep 17 00:00:00 2001 From: "Tim.Ebbeke" Date: Mon, 28 Aug 2023 16:57:54 +0200 Subject: [PATCH 1/3] Moved external project include. --- cmake/backend/emscripten.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/backend/emscripten.cmake b/cmake/backend/emscripten.cmake index 4375f58..95fb5d0 100644 --- a/cmake/backend/emscripten.cmake +++ b/cmake/backend/emscripten.cmake @@ -1,7 +1,5 @@ project(emscripten-git NONE) -include(ExternalProject) - if(UNIX) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/_deps/emscripten-src/upstream/emscripten/.emscripten" @@ -74,6 +72,7 @@ function(nui_add_emscripten_target) set(ENABLE_BIN2HPP "yes") endif() + include(ExternalProject) ExternalProject_Add( "${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-emscripten" SOURCE_DIR "${SOURCE_DIR}" From b7ed613138242211f9a2eb4b57dc90661e0d1f15 Mon Sep 17 00:00:00 2001 From: "Tim.Ebbeke" Date: Mon, 28 Aug 2023 17:11:33 +0200 Subject: [PATCH 2/3] Updated roar dependency. --- cmake/dependencies/roar.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/roar.cmake b/cmake/dependencies/roar.cmake index 2139445..0576123 100644 --- a/cmake/dependencies/roar.cmake +++ b/cmake/dependencies/roar.cmake @@ -1,6 +1,6 @@ option(NUI_FETCH_ROAR "Fetch roar" ON) set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository") -set(NUI_ROAR_TAG "3c9fdde93d0f70f0d0dd32c68f10587ef43dce9d" CACHE STRING "roar tag") +set(NUI_ROAR_TAG "0320c15c7b6b25b51eb17c4ee782d0de23acf697" CACHE STRING "roar tag") if(NUI_FETCH_ROAR) include(FetchContent) From d61efc755c3c8c90ec2fb17e99c8ce8e483e4432 Mon Sep 17 00:00:00 2001 From: "Tim.Ebbeke" Date: Mon, 28 Aug 2023 17:13:21 +0200 Subject: [PATCH 3/3] Added ubuntu 20 workflow. --- .github/workflows/build_and_test.yml | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 06a8dcf..7425020 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -49,6 +49,40 @@ jobs: # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail # run: ctest -C ${{env.BUILD_TYPE}} + ubuntu20: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v3 + - uses: awalsh128/cache-apt-pkgs-action@v1.3.0 + with: + packages: libwebkit2gtk-4.0-dev libcurl4-openssl-dev libcrypto++-dev ninja-build + + - name: Install boost + uses: MarkusJx/install-boost@v2.4.1 + 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 + # OPTIONAL: Specify a platform version + platform_version: 20.04 + + - name: Setup clang + uses: egor-tensin/setup-clang@v1 + with: + version: 15 + platform: x64 + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} -G"Ninja" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DNUI_BUILD_EXAMPLES=off -DCMAKE_CXX_EXTENSIONS=on -DCMAKE_CXX_COMPILER=c++ -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_STANDARD=20 + env: + BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} + + - name: Build + run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}} + windows-msys2: runs-on: windows-2022 defaults: