Merge pull request #250 from RoboStack/addsnapshot

Switch to actually use rosdistro_snapshot.yaml files, update to new rattler-build and add twist_mux
RoboStack · Jan 21, 2025 · ff88d81 · ff88d81
2 parents 14ca9a2 + f20d3fb
commit ff88d81
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 44 deletions.
diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
@@ -45,22 +45,6 @@ jobs:
         # git in C:\Program Files\Git\bin is used by pip install git+
         dirs: 'C:\Program Files\Git\usr\bin;C:\Program Files\Git\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin'
 
-    # - shell: bash -l {0}
-    #   if: matrix.platform == 'linux-aarch64'
-    #   run: |
-    #     echo "::group::Configure binfmt_misc"
-    #     docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
-    #     export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
-    #     export GIT_BRANCH="$(basename $GITHUB_REF)"
-    #     echo "::endgroup::"
-
-    - name: Install libgl1-mesa-dev (only for linux-aarch64)
-      if: matrix.platform == 'linux-aarch64'
-      shell: bash -l {0}
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxi-dev libxmu-dev
-
     # For some reason, the Strawberry perl's pkg-config is found
     # instead of the conda's one, so let's delete the /c/Strawberry directory
     # Furthermore, we also need to remove an older SDK that is used and can result in compilation problems

diff --git a/conda_build_config.yaml b/conda_build_config.yaml
@@ -9,27 +9,35 @@ spdlog:
 pugixml:
   - '1.14'
 
-cdt_name:
-  - ${{ "cos7" if linux }}
+cdt_name:  # [linux]
+  - conda  # [linux]
 
 python:
   - 3.11.* *_cpython
 python_impl:
   - cpython
 
-c_stdlib:
-  - ${{ "sysroot" if linux }}
-  - ${{ "macosx_deployment_target" if osx }}
-  - ${{ "vs" if win }}
-c_stdlib_version:
-  - ${{ "2.17" if linux }}
-  - ${{ "10.14" if osx and x86_64 }}
-  - ${{ "11.0" if osx and arm64 }}
 c_compiler:
-  - ${{ "gcc" if linux }}
-  - ${{ "clang" if osx }}
-  - ${{ "vs2019" if win }}
+  - gcc                        # [linux]
+  - clang                      # [osx]
+  - vs2019                     # [win and x86_64]
+  - vs2022                     # [win and arm64]
+c_compiler_version:            # [unix]
+  - 13                         # [linux]
+  - 18                         # [osx]
+c_stdlib:
+  - sysroot                    # [linux]
+  - macosx_deployment_target   # [osx]
+  - vs                         # [win]
+c_stdlib_version:              # [unix]
+  - 2.17                       # [linux]
+  - 10.13                      # [osx and x86_64]
+  - 11.0                       # [osx and arm64]
 cxx_compiler:
-  - ${{ "gxx" if linux }}
-  - ${{ "clangxx" if osx }}
-  - ${{ "vs2019" if win }}
+  - gxx                        # [linux]
+  - clangxx                    # [osx]
+  - vs2019                     # [win and x86_64]
+  - vs2022                     # [win and arm64]
+cxx_compiler_version:          # [unix]
+  - 13                         # [linux]
+  - 18                         # [osx]
diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -16,7 +16,7 @@ upload = "anaconda -t $ANACONDA_API_TOKEN upload"
 
 [dependencies]
 python = ">=3.11.0,<3.12"
-rattler-build = ">=0.33.2"
+rattler-build = ">=0.35.5"
 anaconda-client = ">=1.12"
 
 [target.win-64.dependencies]
@@ -27,14 +27,14 @@ git = "*"
 
 [feature.beta.pypi-dependencies]
 # This is tipically the latest commit on main branch
-vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "a081fad2b1d72cfa4c3cc30010dae024ade79d0c" }
+vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "cbb8eba834ce3834df552977d6b08c325a30768e" }
 # Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
 # (and regenerate the pixi.lock) once you push the modified commit to the repo
 #vinca = { path = "../vinca", editable = true }
 
 [feature.beta.tasks]
 generate-recipes = { cmd = "vinca -m", depends-on = ["rename-file"] }
-remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
+remove-file = { cmd = "rm vinca.yaml; rm -rf recipes; mkdir recipes" }
 build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing" }
 build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends-on = ["build_additional_recipes", "generate-recipes"] }
 build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-humble-ros-workspace" } }

diff --git a/snapshot_2025-01-10-12-52-27.yaml → rosdistro_snapshot.yaml b/snapshot_2025-01-10-12-52-27.yaml → rosdistro_snapshot.yaml
@@ -1,3 +1,4 @@
+# Generated by vinca-snapshot on 2025-01-10-12-52-27 for distro humble
 aandd_ekew_driver_py:
   tag: release/humble/aandd_ekew_driver_py/0.0.2-3
   url: https://github.com/ros2-gbp/aandd_ekew_driver_py-release.git

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -178,6 +178,9 @@ packages_select_by_deps:
 
   - lanelet2
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/249
+  - twist_mux
+
   # ----- end of package support -----
 
   # - rtabmap
@@ -547,3 +550,4 @@ packages_select_by_deps:
   # - osrf_testing_tools_cpp
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -107,6 +107,8 @@ packages_select_by_deps:
 
   - lanelet2
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/249
+  - twist_mux
 
   # Used to work, now needs fixes
   # - rtabmap
@@ -405,4 +407,4 @@ packages_select_by_deps:
   # - osrf_testing_tools_cpp
 
 patch_dir: patch
-
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -129,4 +129,8 @@ packages_select_by_deps:
 
   - lanelet2
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/249
+  - twist_mux
+
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -113,11 +113,14 @@ packages_select_by_deps:
 
   # requested in https://github.com/RoboStack/ros-humble/pull/205
   - rosbag2_storage_mcap
-  
+
   # Universal Robots, requested in https://github.com/RoboStack/ros-humble/issues/234, https://github.com/RoboStack/ros-humble/issues/227 and https://github.com/RoboStack/ros-humble/issues/222 
   - ur
 
-  - lanelet2                  
+  - lanelet2
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/249
+  - twist_mux
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -243,4 +243,8 @@ packages_select_by_deps:
 
   - lanelet2
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/249
+  - twist_mux
+
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml