diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index b876f4b..c4ee348 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -10,9 +10,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.8.1 with: - pixi-version: v0.19.0 + pixi-version: v0.26.1 cache: true - run: pixi run cpp-fmt-check diff --git a/pixi.lock b/pixi.lock index 15cacb5..e446af1 100644 --- a/pixi.lock +++ b/pixi.lock @@ -1,4 +1,4 @@ -version: 4 +version: 5 environments: default: channels: @@ -133,7 +133,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/jasper-4.2.3-he6dfbbe_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/jsoncpp-1.9.5-h4bd325d_1.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/jxrlib-1.1-hd590300_3.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-2.6.32-he073ed8_17.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-3.10.0-he073ed8_17.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.5-py311h9547e67_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/krb5-1.21.2-h659d440_0.conda @@ -616,7 +616,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/spdlog-1.12.0-hd2e6256_2.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/svt-av1-2.0.0-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.12-he073ed8_17.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.17-h4a8ded7_17.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tbb-2021.12.0-h00ab1b0_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tbb-devel-2021.12.0-h5ccd973_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tinyxml-2.6.2-h4bd325d_2.tar.bz2 @@ -10863,20 +10863,20 @@ packages: timestamp: 1703333860145 - kind: conda name: kernel-headers_linux-64 - version: 2.6.32 + version: 3.10.0 build: he073ed8_17 build_number: 17 subdir: noarch noarch: generic - url: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-2.6.32-he073ed8_17.conda - sha256: fb39d64b48f3d9d1acc3df208911a41f25b6a00bd54935d5973b4739a9edd5b6 - md5: d731b543793afc0433c4fd593e693fce + url: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-3.10.0-he073ed8_17.conda + sha256: c28d69ca84533f0e2093f17ae6d3e19ee3661dd397618630830b1b9afc3bfb4d + md5: 285931bd28b3b8f176d46dd9fd627a09 constrains: - - sysroot_linux-64 ==2.12 + - sysroot_linux-64 ==2.17 license: LGPL-2.0-or-later AND LGPL-2.0-or-later WITH exceptions AND GPL-2.0-or-later AND MPL-2.0 license_family: GPL - size: 710627 - timestamp: 1708000830116 + size: 945088 + timestamp: 1727437651716 - kind: conda name: kernel-headers_linux-aarch64 version: 4.18.0 @@ -64674,20 +64674,21 @@ packages: timestamp: 1710374582341 - kind: conda name: sysroot_linux-64 - version: '2.12' - build: he073ed8_17 + version: '2.17' + build: h4a8ded7_17 build_number: 17 subdir: noarch noarch: generic - url: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.12-he073ed8_17.conda - sha256: b4e4d685e41cb36cfb16f0cb15d2c61f8f94f56fab38987a44eff95d8a673fb5 - md5: 595db67e32b276298ff3d94d07d47fbf + url: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.17-h4a8ded7_17.conda + sha256: 5629b0e93c8e9fb9152de46e244d32ff58184b2cbf0f67757826a9610f3d1a21 + md5: f58cb23983633068700a756f0b5f165a depends: - - kernel-headers_linux-64 2.6.32 he073ed8_17 + - kernel-headers_linux-64 3.10.0 he073ed8_17 + - tzdata license: LGPL-2.0-or-later AND LGPL-2.0-or-later WITH exceptions AND GPL-2.0-or-later AND MPL-2.0 license_family: GPL - size: 15127123 - timestamp: 1708000843849 + size: 15141219 + timestamp: 1727437660028 - kind: conda name: sysroot_linux-aarch64 version: '2.17' diff --git a/pixi.toml b/pixi.toml index 5c74f9c..9e4073e 100644 --- a/pixi.toml +++ b/pixi.toml @@ -85,7 +85,7 @@ cwd = "humble_ws" cmd = "curl -L -C - -O https://storage.googleapis.com/rerun-example-datasets/go2_ros2.zip && unzip go2_ros2.zip" cwd = "humble_ws/install/rerun_bridge/share/rerun_bridge" outputs = ["humble_ws/install/rerun_bridge/share/rerun_bridge/go2_ros2"] -depends_on=["build"] +depends_on = ["build"] # Get the go2_ros2_sdk package # @@ -100,7 +100,14 @@ depends_on = ["ws"] [tasks.go2_example] cmd = "bash -c 'source ./install/local_setup.bash && ros2 launch rerun_bridge go2_example.launch'" -depends_on = ["build", "go2_example_data", "go2_ros2_sdk", "rosbag2_storage_mcap", "rerun_viewer", "rerun_urdf_loader"] +depends_on = [ + "build", + "go2_example_data", + "go2_ros2_sdk", + "rosbag2_storage_mcap", + "rerun_viewer", + "rerun_urdf_loader", +] cwd = "humble_ws" # Install Rerun and URDF loader manually via pip3, this should be replaced with direct pypi dependencies in the future. @@ -111,7 +118,7 @@ cmd = "pip install rerun-sdk==0.18.2" cmd = "pip install git+https://github.com/rerun-io/rerun-loader-python-example-urdf.git" [dependencies] -pip = ">=24.0,<25" # To install rerun-sdk and rerun-loader-python-example-urdf +pip = ">=24.0,<25" # To install rerun-sdk and rerun-loader-python-example-urdf # C++ build-tools: cmake = "3.27.6" @@ -133,3 +140,9 @@ opencv = ">=4.9.0,<4.10" # Additional dependencies for mcap support ros-humble-rosbag2-test-common = ">=0.15.9,<0.16" + +[target.linux-64.dependencies] +sysroot_linux-64 = ">=2.17,<3" # rustc 1.64+ requires glibc 2.17+, see https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html + +[target.linux-aarch64.dependencies] +sysroot_linux-aarch64 = ">=2.17,<3" # rustc 1.64+ requires glibc 2.17+, see https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html