From d6673fe0332bce48303fa9a1131377f3ecb48cfb Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 28 Jul 2021 11:45:02 +0200 Subject: [PATCH 1/3] build: `force_host_context=True` added for `build_requires` --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index e3f2cbd8..83df621e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -74,8 +74,8 @@ class UnitsConan(ConanFile): def build_requirements(self): if self._run_tests: - self.build_requires("catch2/2.13.4") - self.build_requires("linear_algebra/0.7.1@conan-oss/stable") + self.build_requires("catch2/2.13.4", force_host_context=True) + self.build_requires("linear_algebra/0.7.1@conan-oss/stable", force_host_context=True) if self.options.build_docs: self.build_requires("doxygen/1.9.1") From 01912350d2fe79e238cf6da57ccaf84a955de3e8 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 28 Jul 2021 13:09:54 +0200 Subject: [PATCH 2/3] ci: "Ubuntu GCC 10.1.0" removed and "10.2.0" renamed to "10.3.0" "Ubuntu GCC 10.1.0" is no longer provided on `ubuntu-18.04` image --- .github/workflows/ci-conan.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 84052ef7..569d4458 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -44,13 +44,7 @@ jobs: compiler: { type: VISUAL, version: 16, cc: "cl", cxx: "cl" } } - { - name: "Ubuntu GCC 10.1.0", - os: ubuntu-18.04, - compiler: { type: GCC, version: 10, cc: "gcc-10", cxx: "g++-10" }, - lib: "libstdc++11" - } - - { - name: "Ubuntu GCC 10.2.0", + name: "Ubuntu GCC 10.3.0", os: ubuntu-20.04, compiler: { type: GCC, version: 10, cc: "gcc-10", cxx: "g++-10" }, lib: "libstdc++11" From b2e98808c4d56b6ac64cc80e2924a7ff4c958b0f Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 28 Jul 2021 13:11:11 +0200 Subject: [PATCH 3/3] ci: The same changes applied to "CMake Test Package CI" workflow --- .github/workflows/ci-test-package-cmake.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index be5e46f7..e97c43fa 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -48,13 +48,7 @@ jobs: compiler: { type: VISUAL, version: 16, cc: "", cxx: "" } } - { - name: "Ubuntu GCC 10.1.0", - os: ubuntu-18.04, - compiler: { type: GCC, version: 10, cc: "gcc-10", cxx: "g++-10" }, - lib: "libstdc++11" - } - - { - name: "Ubuntu GCC 10.2.0", + name: "Ubuntu GCC 10.3.0", os: ubuntu-20.04, compiler: { type: GCC, version: 10, cc: "gcc-10", cxx: "g++-10" }, lib: "libstdc++11"