diff --git a/.github/workflows/build-cloe.yaml b/.github/workflows/build-cloe.yaml index a07c2f26b..5ae969956 100644 --- a/.github/workflows/build-cloe.yaml +++ b/.github/workflows/build-cloe.yaml @@ -5,7 +5,6 @@ on: paths-ignore: - "*.md" - ".gitignore" - - "Doxyfile" - "LICENSE" - "dist/**" - "docs/**" @@ -16,9 +15,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04] - build_type: [RelWithDebInfo] - package_target: [package] + os: + - "ubuntu-20.04" + - "ubuntu-22.04" + conan_profile: + - "cloe-normal" + package_target: + # 1. Build each test configuration in Conan cache and run all tests + - "export smoketest-deps smoketest" env: CONAN_NON_INTERACTIVE: "yes" DEBIAN_FRONTEND: noninteractive @@ -47,12 +51,9 @@ jobs: - name: Configure Conan run: | make setup-conan - - name: Build cloe w/ package + conan config set general.default_profile=${{ matrix.conan_profile }} + conan config set general.default_build_profile=${{ matrix.conan_profile }} + make export-cli + - name: Build cloe run: | make ${{ matrix.package_target }} - - name: Build smoketest dependencies - run: | - make smoketest-deps - - name: Run smoketests - run: | - make smoketest diff --git a/tests/conanfile_with_boost_1.78.py b/tests/conanfile_with_boost_1.78.py deleted file mode 100644 index c7986e073..000000000 --- a/tests/conanfile_with_boost_1.78.py +++ /dev/null @@ -1,39 +0,0 @@ -# mypy: ignore-errors -# pylint: skip-file - -from pathlib import Path - -from conan import ConanFile - - -class CloeTest(ConanFile): - python_requires = "cloe-launch-profile/[>=0.20.0]@cloe/develop" - python_requires_extend = "cloe-launch-profile.Base" - - default_options = { - "cloe:with_vtd": False, - "cloe-engine:server": True, - } - - @property - def cloe_launch_env(self): - return { - "CLOE_LOG_LEVEL": "debug", - "CLOE_STRICT_MODE": "1", - "CLOE_WRITE_OUTPUT": "0", - "CLOE_ROOT": Path(self.recipe_folder) / "..", - } - - def set_version(self): - self.version = self.project_version("../VERSION") - - def requirements(self): - self.requires(f"cloe/{self.version}@cloe/develop") - if self.options["cloe"].with_vtd: - # These dependencies aren't pulled in by the "cloe" package, - # because they are not required to build the package. - # We need them to run the tests though. - self.requires("osi-sensor/1.0.0-vtd2.2@cloe/stable") - self.requires("vtd/2.2.0@cloe-restricted/stable") - - self.requires("boost/1.78.0", override=True)