From 3888075548dc33b060ea2b1d99acadf37bcaa424 Mon Sep 17 00:00:00 2001 From: Filippo Brizzi Date: Wed, 31 Jan 2024 12:38:02 +0000 Subject: [PATCH] add step --- .github/workflows/cmake-single-platform.yml | 41 --------------------- CMakePresets.json | 15 +++++++- docker/Dockerfile | 1 - 3 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/cmake-single-platform.yml diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml deleted file mode 100644 index ab23dc8f..00000000 --- a/.github/workflows/cmake-single-platform.yml +++ /dev/null @@ -1,41 +0,0 @@ -# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml -name: CMake on a single platform - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - PRESET: preferred - -jobs: - build: - # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. - # You can convert this to a matrix build if you need cross-platform coverage. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Install dependencies - run: sudo apt update && sudo apt install -y ninja-build - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DBUILD_MODULES=all -DCMAKE_BUILD_TYPE=Release - - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build -- all examples - - - name: Test - working-directory: ${{github.workspace}}/build - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: make check diff --git a/CMakePresets.json b/CMakePresets.json index 94c325e2..282cfff2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -11,7 +11,20 @@ "cacheVariables": { "BUILD_MODULES": "all" } - } + }, + { + "name": "docker", + "description": "Configuration setting for all modules with preferred toolchain", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build", + "installDir": "/install", + "toolchainFile": "${sourceDir}/toolchains/toolchain_clang.cmake", + "cacheVariables": { + "BUILD_MODULES": "all", + "DENABLE_LINTER": "OFF", + "CMAKE_BUILD_TYPE": "Release" + } + } ], "buildPresets": [ { diff --git a/docker/Dockerfile b/docker/Dockerfile index dbe1bd4f..3789c280 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,5 @@ ARG BASE_IMAGE -# FROM arm64v8/ubuntu:22.04 FROM ${BASE_IMAGE} ENV DEBIAN_FRONTEND=noninteractive