From 9a3a233a56d54c1abf6e504c079401d7c1962afd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 12:49:53 +0000 Subject: [PATCH] chore(ci): bump prefix-dev/rattler-build-action from 0.2.25 to 0.2.26 (#100) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bas Zalmstra --- .github/workflows/cpp-test.yml | 2 +- pixi.toml | 126 ++++++++++++++++----------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/cpp-test.yml b/.github/workflows/cpp-test.yml index 774dcf6..5dccde9 100644 --- a/.github/workflows/cpp-test.yml +++ b/.github/workflows/cpp-test.yml @@ -68,7 +68,7 @@ jobs: - name: Checkout source code uses: actions/checkout@v4 - name: Build conda package - uses: prefix-dev/rattler-build-action@v0.2.25 + uses: prefix-dev/rattler-build-action@v0.2.26 with: recipe-path: recipe/recipe.yaml # needs to be unique for each matrix entry diff --git a/pixi.toml b/pixi.toml index d8d0f9c..25bfd5a 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,63 +1,63 @@ -[project] -name = "resolvo" -authors = ["Bas Zalmstra "] -channels = ["conda-forge"] -platforms = ["linux-64", "win-64", "osx-arm64", "osx-64"] - -[tasks] -format = {depends_on = ["format-rust", "format-cpp", "format-cmake"] } -test = {depends_on = ["test-rust", "test-cpp"] } - -# ---- Build Rust using Cargo ---- -[feature.build-rust.dependencies] -rust = "~=1.75.0" - -[feature.test-rust.tasks.test-rust] -cmd = "cargo test" - -[feature.test-rust.tasks.format-rust] -cmd = "cargo fmt" - -[environments.test-rust] -features = ["build-rust", "test-rust"] -solve-group = "default" - -# ---- Build C++ using CMake ---- -[feature.build-cpp.dependencies] -cmake = ">=3.29.4,<3.30" -cxx-compiler = ">=1.7.0,<1.8" -ninja = ">=1.12.1,<1.13" - -[feature.build-cpp.tasks.configure] -cmd = "cmake -GNinja -S . -B build -DRESOLVO_BUILD_TESTING=ON" -inputs = ["CMakeLists.txt"] -outputs = ["build/CMakeFiles/"] - -[feature.build-cpp.tasks.build-cpp] -cmd = ["cmake", "--build", "build"] -depends-on = ["configure"] -inputs = ["CMakeLists.txt", "cpp/**/*", "src/**"] -outputs = ["build/bin/*"] - -[feature.build-cpp.tasks.test-cpp] -cmd = "ctest --test-dir build" -depends_on = ["build-cpp"] - -[environments.test-cpp] -features = ["build-cpp", "build-rust"] -solve-group = "default" - -# ---- Format C++ ---- -[feature.format-cpp.dependencies] -clang-format = ">=18.1.6,<18.2" -cmake-format = ">=0.6.13,<0.7" - -[feature.format-cpp.tasks.format-cpp] -cmd = "clang-format -i cpp/include/*.h cpp/tests/*.cpp" - -[feature.format-cpp.tasks.format-cmake] -cmd = "cmake-format -i CMakeLists.txt cpp/CMakeLists.txt cpp/tests/CMakeLists.txt" - -[environments.format-cpp] -features=["format-cpp"] -solve-group="default" +[project] +name = "resolvo" +authors = ["Bas Zalmstra "] +channels = ["conda-forge"] +platforms = ["linux-64", "win-64", "osx-arm64", "osx-64"] + +[tasks] +format = {depends-on = ["format-rust", "format-cpp", "format-cmake"] } +test = {depends-on = ["test-rust", "test-cpp"] } + +# ---- Build Rust using Cargo ---- +[feature.build-rust.dependencies] +rust = "~=1.75.0" + +[feature.test-rust.tasks.test-rust] +cmd = "cargo test" + +[feature.test-rust.tasks.format-rust] +cmd = "cargo fmt" + +[environments.test-rust] +features = ["build-rust", "test-rust"] +solve-group = "default" + +# ---- Build C++ using CMake ---- +[feature.build-cpp.dependencies] +cmake = ">=3.29.4,<3.30" +cxx-compiler = ">=1.7.0,<1.8" +ninja = ">=1.12.1,<1.13" + +[feature.build-cpp.tasks.configure] +cmd = "cmake -GNinja -S . -B build -DRESOLVO_BUILD_TESTING=ON" +inputs = ["CMakeLists.txt"] +outputs = ["build/CMakeFiles/"] + +[feature.build-cpp.tasks.build-cpp] +cmd = ["cmake", "--build", "build"] +depends-on = ["configure"] +inputs = ["CMakeLists.txt", "cpp/**/*", "src/**"] +outputs = ["build/bin/*"] + +[feature.build-cpp.tasks.test-cpp] +cmd = "ctest --test-dir build" +depends-on = ["build-cpp"] + +[environments.test-cpp] +features = ["build-cpp", "build-rust"] +solve-group = "default" + +# ---- Format C++ ---- +[feature.format-cpp.dependencies] +clang-format = ">=18.1.6,<18.2" +cmake-format = ">=0.6.13,<0.7" + +[feature.format-cpp.tasks.format-cpp] +cmd = "clang-format -i cpp/include/*.h cpp/tests/*.cpp" + +[feature.format-cpp.tasks.format-cmake] +cmd = "cmake-format -i CMakeLists.txt cpp/CMakeLists.txt cpp/tests/CMakeLists.txt" + +[environments.format-cpp] +features=["format-cpp"] +solve-group="default"