Skip to content

Commit ff88d81

Browse files
Tobias-FischerTobias-Fischer
authored
Merge pull request #250 from RoboStack/addsnapshot
Switch to actually use rosdistro_snapshot.yaml files, update to new rattler-build and add twist_mux
2 parents 14ca9a2 + f20d3fb commit ff88d81

File tree

10 files changed

+54
-44
lines changed

10 files changed

+54
-44
lines changed

‎.github/workflows/testpr.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,6 @@ jobs:
4545
# git in C:\Program Files\Git\bin is used by pip install git+
4646
dirs: 'C:\Program Files\Git\usr\bin;C:\Program Files\Git\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin'
4747

48-
# - shell: bash -l {0}
49-
# if: matrix.platform == 'linux-aarch64'
50-
# run: |
51-
# echo "::group::Configure binfmt_misc"
52-
# docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
53-
# export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
54-
# export GIT_BRANCH="$(basename $GITHUB_REF)"
55-
# echo "::endgroup::"
56-
57-
- name: Install libgl1-mesa-dev (only for linux-aarch64)
58-
if: matrix.platform == 'linux-aarch64'
59-
shell: bash -l {0}
60-
run: |
61-
sudo apt-get update
62-
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxi-dev libxmu-dev
63-
6448
# For some reason, the Strawberry perl's pkg-config is found
6549
# instead of the conda's one, so let's delete the /c/Strawberry directory
6650
# Furthermore, we also need to remove an older SDK that is used and can result in compilation problems

‎conda_build_config.yaml‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,35 @@ spdlog:
99
pugixml:
1010
- '1.14'
1111

12-
cdt_name:
13-
- ${{ "cos7" if linux }}
12+
cdt_name: # [linux]
13+
- conda # [linux]
1414

1515
python:
1616
- 3.11.* *_cpython
1717
python_impl:
1818
- cpython
1919

20-
c_stdlib:
21-
- ${{ "sysroot" if linux }}
22-
- ${{ "macosx_deployment_target" if osx }}
23-
- ${{ "vs" if win }}
24-
c_stdlib_version:
25-
- ${{ "2.17" if linux }}
26-
- ${{ "10.14" if osx and x86_64 }}
27-
- ${{ "11.0" if osx and arm64 }}
2820
c_compiler:
29-
- ${{ "gcc" if linux }}
30-
- ${{ "clang" if osx }}
31-
- ${{ "vs2019" if win }}
21+
- gcc # [linux]
22+
- clang # [osx]
23+
- vs2019 # [win and x86_64]
24+
- vs2022 # [win and arm64]
25+
c_compiler_version: # [unix]
26+
- 13 # [linux]
27+
- 18 # [osx]
28+
c_stdlib:
29+
- sysroot # [linux]
30+
- macosx_deployment_target # [osx]
31+
- vs # [win]
32+
c_stdlib_version: # [unix]
33+
- 2.17 # [linux]
34+
- 10.13 # [osx and x86_64]
35+
- 11.0 # [osx and arm64]
3236
cxx_compiler:
33-
- ${{ "gxx" if linux }}
34-
- ${{ "clangxx" if osx }}
35-
- ${{ "vs2019" if win }}
37+
- gxx # [linux]
38+
- clangxx # [osx]
39+
- vs2019 # [win and x86_64]
40+
- vs2022 # [win and arm64]
41+
cxx_compiler_version: # [unix]
42+
- 13 # [linux]
43+
- 18 # [osx]

‎pixi.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pixi.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ upload = "anaconda -t $ANACONDA_API_TOKEN upload"
1616

1717
[dependencies]
1818
python = ">=3.11.0,<3.12"
19-
rattler-build = ">=0.33.2"
19+
rattler-build = ">=0.35.5"
2020
anaconda-client = ">=1.12"
2121

2222
[target.win-64.dependencies]
@@ -27,14 +27,14 @@ git = "*"
2727

2828
[feature.beta.pypi-dependencies]
2929
# This is tipically the latest commit on main branch
30-
vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "a081fad2b1d72cfa4c3cc30010dae024ade79d0c" }
30+
vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "cbb8eba834ce3834df552977d6b08c325a30768e" }
3131
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
3232
# (and regenerate the pixi.lock) once you push the modified commit to the repo
3333
#vinca = { path = "../vinca", editable = true }
3434

3535
[feature.beta.tasks]
3636
generate-recipes = { cmd = "vinca -m", depends-on = ["rename-file"] }
37-
remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
37+
remove-file = { cmd = "rm vinca.yaml; rm -rf recipes; mkdir recipes" }
3838
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" }
3939
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"] }
4040
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" } }

‎snapshot_2025-01-10-12-52-27.yaml‎ renamed to ‎rosdistro_snapshot.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Generated by vinca-snapshot on 2025-01-10-12-52-27 for distro humble
12
aandd_ekew_driver_py:
23
tag: release/humble/aandd_ekew_driver_py/0.0.2-3
34
url: https://github.com/ros2-gbp/aandd_ekew_driver_py-release.git

‎vinca_linux_64.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ packages_select_by_deps:
178178

179179
- lanelet2
180180

181+
# requested in https://github.com/RoboStack/ros-humble/issues/249
182+
- twist_mux
183+
181184
# ----- end of package support -----
182185

183186
# - rtabmap
@@ -547,3 +550,4 @@ packages_select_by_deps:
547550
# - osrf_testing_tools_cpp
548551

549552
patch_dir: patch
553+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_linux_aarch64.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ packages_select_by_deps:
107107

108108
- lanelet2
109109

110+
# requested in https://github.com/RoboStack/ros-humble/issues/249
111+
- twist_mux
110112

111113
# Used to work, now needs fixes
112114
# - rtabmap
@@ -405,4 +407,4 @@ packages_select_by_deps:
405407
# - osrf_testing_tools_cpp
406408

407409
patch_dir: patch
408-
410+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_osx.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,8 @@ packages_select_by_deps:
129129

130130
- lanelet2
131131

132+
# requested in https://github.com/RoboStack/ros-humble/issues/249
133+
- twist_mux
134+
132135
patch_dir: patch
136+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_osx_arm64.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,14 @@ packages_select_by_deps:
113113

114114
# requested in https://github.com/RoboStack/ros-humble/pull/205
115115
- rosbag2_storage_mcap
116-
116+
117117
# 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
118118
- ur
119119

120-
- lanelet2
120+
- lanelet2
121121

122+
# requested in https://github.com/RoboStack/ros-humble/issues/249
123+
- twist_mux
122124

123125
patch_dir: patch
126+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_win.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,8 @@ packages_select_by_deps:
243243

244244
- lanelet2
245245

246+
# requested in https://github.com/RoboStack/ros-humble/issues/249
247+
- twist_mux
248+
246249
patch_dir: patch
250+
rosdistro_snapshot: rosdistro_snapshot.yaml

0 commit comments

Comments
 (0)