From 82b7de6ff694f4f09c23e0a04acd9fc06f801895 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 28 Jul 2026 11:55:12 +0200 Subject: [PATCH] CI: Remove Release build and install steps --- .github/workflows/build.yml | 10 +++++----- conanfile.py | 18 ++---------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c7cad1..29c73b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ env: # for matrix check https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners jobs: prepare_matrix: - runs-on: ubuntu-latest + runs-on: ubuntu-slim outputs: matrix: ${{ steps.matrix_setup.outputs.matrix }} steps: @@ -37,14 +37,14 @@ jobs: steps: - name: Checkout the source if: github.event_name != 'pull_request' - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: submodules: recursive fetch-depth: 0 - name: Checkout the source - pull request if: github.event_name == 'pull_request' - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: submodules: recursive fetch-depth: 0 @@ -56,12 +56,12 @@ jobs: sudo xcode-select -switch /Applications/Xcode_${{matrix.build-xcode-version}}.app - name: Setup python version - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: "3.13" - name: Start ssh key agent - uses: webfactory/ssh-agent@v0.9.0 + uses: webfactory/ssh-agent@v0.10.0 with: ssh-private-key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }} diff --git a/conanfile.py b/conanfile.py index 4cf63ec..de47f0a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -107,7 +107,8 @@ def generate(self): tc.variables["ManiVault_DIR"] = manivault_dir # Set some build options - tc.variables["MV_UNITY_BUILD"] = "ON" + tc.cache_variables["MV_UNITY_BUILD"] = "ON" + tc.cache_variables["CMAKE_CONFIGURATION_TYPES"] = "RelWithDebInfo" if os_info.is_macos: proc = subprocess.run("brew --prefix libomp", shell=True, capture_output=True) @@ -153,7 +154,6 @@ def build(self): cmake = self._configure_cmake() cmake.build(build_type="RelWithDebInfo") - cmake.build(build_type="Release") def package(self): package_dir = pathlib.Path(self.build_folder, "package") @@ -171,23 +171,9 @@ def package(self): relWithDebInfo_dir, ] ) - subprocess.run( - [ - "cmake", - "--install", - self.build_folder, - "--config", - "Release", - "--prefix", - release_dir, - ] - ) self.copy(pattern="*", src=package_dir) def package_info(self): self.cpp_info.relwithdebinfo.libdirs = ["RelWithDebInfo/lib"] self.cpp_info.relwithdebinfo.bindirs = ["RelWithDebInfo/Plugins", "RelWithDebInfo"] self.cpp_info.relwithdebinfo.includedirs = ["RelWithDebInfo/include", "RelWithDebInfo"] - self.cpp_info.release.libdirs = ["Release/lib"] - self.cpp_info.release.bindirs = ["Release/Plugins", "Release"] - self.cpp_info.release.includedirs = ["Release/include", "Release"]