From c061b7ae95b433eda2ce1940250e96c9c041276d Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 1 Oct 2021 01:34:15 +0200 Subject: [PATCH] chore: gcc-10 support added --- .gitpod.yml | 15 +++++++++++++++ gitpod.yml | 33 --------------------------------- 2 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml index 58564623..e07a6ddf 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -11,9 +11,13 @@ tasks: conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default conan remote add -i 0 conan-mpusz https://mpusz.jfrog.io/artifactory/api/conan/conan-oss pushd /workspace/.conan/profiles + cp default gcc10 cp default gcc11 cp default clang13 popd + conan profile update settings.compiler.version=10 gcc10 + conan profile update env.CXX=/usr/bin/g++-10 gcc10 + conan profile update env.CC=/usr/bin/gcc-10 gcc10 conan profile update settings.compiler=clang clang13 conan profile update settings.compiler.version=13 clang13 conan profile update settings.compiler.libcxx=libc++ clang13 @@ -21,6 +25,17 @@ tasks: conan profile update env.CC=/usr/bin/clang-13 clang13 gp sync-done conan-init exit + - name: gcc-10 + init: | + gp sync-await conan-init + mkdir -p build/GCC-10 && cd build/GCC-10 + conan install ../.. -pr gcc10 -e mp-units:CONAN_RUN_TESTS=True -o build_docs=False -b outdated + conan install ../.. -pr gcc10 -e mp-units:CONAN_RUN_TESTS=True -o build_docs=False -b outdated -s build_type=Debug + cmake ../.. --no-warn-unused-cli -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DCMAKE_C_COMPILER=/bin/x86_64-linux-gnu-gcc-10 -DCMAKE_CXX_COMPILER=/bin/x86_64-linux-gnu-g++-10 + cmake --build . --config Release -j + cmake --build . --config Debug -j + ctest -C Release + ctest -C Debug - name: gcc-11 init: | gp sync-await conan-init diff --git a/gitpod.yml b/gitpod.yml deleted file mode 100644 index 1f340ec1..00000000 --- a/gitpod.yml +++ /dev/null @@ -1,33 +0,0 @@ -image: trainiteu/gitpod-cpp - -# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/ -tasks: - - name: gcc-11 Release - init: | - mkdir -p build/GCC-11 && cd build/GCC-11 - conan install ../.. -pr gcc11 -s compiler.cppstd=20 -e mp-units:CONAN_RUN_TESTS=True -o build_docs=False -b outdated -u - conan build ../.. - - name: gcc-11 Debug - init: | - mkdir -p build/GCC-11 && cd build/GCC-11 - conan install ../.. -pr gcc11 -s compiler.cppstd=20 -s build_type=Debug -e mp-units:CONAN_RUN_TESTS=True -o build_docs=False -b outdated -u - conan build ../.. - - name: clang-13 Release - init: | - mkdir -p build/GCC-11 && cd build/Clang-13 - conan install ../.. -pr clang13 -s compiler.cppstd=20 -e mp-units:CONAN_RUN_TESTS=True -o build_docs=False -b outdated -u - conan build ../.. - - name: clang-13 Debug - init: | - mkdir -p build/GCC-11 && cd build/Clang-13 - conan install ../.. -pr clang13 -s compiler.cppstd=20 -s build_type=Debug -e mp-units:CONAN_RUN_TESTS=True -o build_docs=False -b outdated -u - conan build ../.. - -vscode: - extensions: - - twxs.cmake - - ms-vscode.cmake-tools - - streetsidesoftware.code-spell-checker - - vivaxy.vscode-conventional-commits - - github.vscode-pull-request-github - - lextudio.restructuredtext