Skip to content

Commit 509ba72

Browse files
traversarotraversaro
authored
Actually use snapshot, rebuild ros-noetic-desktop and ros-noetic-desktop-full with tests and remove rqt_web and webkit_dependency from rqt_common_plugins dependencies (#506)
* Actually use snapshot and rebuild ros-noetic-desktop with tests * Fix pkg_additional_info name and switch conda_build_config.yaml to support new pixi * Remove problematic run dependency from ros-distro-mutex * Remove from deps rqt_web and webkit_dependency * Fix tests for desktop and desktop_full * Fix tests
1 parent 330ac1d commit 509ba72

File tree

11 files changed

+92
-23
lines changed

11 files changed

+92
-23
lines changed

‎additional_recipes/ros-distro-mutex/recipe.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package:
33
version: 0.6.0
44

55
build:
6-
number: 0
6+
number: 1
77
# Note: keep in sync with build number
88
# Cannot be done automatically, see https://github.com/mamba-org/boa/issues/278
9-
string: noetic_0
9+
string: noetic_1
1010

1111
requirements:
1212
# NOTE:
@@ -36,9 +36,7 @@ requirements:
3636
- gazebo 11.*
3737
- libprotobuf 5.28.3.*
3838
- ogre 1.10.12.*
39-
- libpqxx 7.8.*
40-
- sip 6.7.*
41-
- harfbuzz 10.*
39+
4240

4341
run_exports:
4442
weak:

‎conda_build_config.yaml‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
harfbuzz:
2-
- '10'
31
gazebo:
42
- '11'
5-
libpqxx:
6-
- 6
73
ogre:
84
- 1.10.12
95
setuptools:
@@ -31,19 +27,28 @@ python:
3127
python_impl:
3228
- cpython
3329

34-
c_stdlib:
35-
- ${{ "sysroot" if linux }}
36-
- ${{ "macosx_deployment_target" if osx }}
37-
- ${{ "vs" if win }}
38-
c_stdlib_version:
39-
- ${{ "2.17" if linux }}
40-
- ${{ "10.14" if osx and x86_64 }}
41-
- ${{ "11.0" if osx and arm64 }}
4230
c_compiler:
43-
- ${{ "gcc" if linux }}
44-
- ${{ "clang" if osx }}
45-
- ${{ "vs2019" if win }}
31+
- gcc # [linux]
32+
- clang # [osx]
33+
- vs2019 # [win and x86_64]
34+
- vs2022 # [win and arm64]
35+
c_compiler_version: # [unix]
36+
- 13 # [linux]
37+
- 18 # [osx]
38+
c_stdlib:
39+
- sysroot # [linux]
40+
- macosx_deployment_target # [osx]
41+
- vs # [win]
42+
c_stdlib_version: # [unix]
43+
- 2.17 # [linux]
44+
- 10.13 # [osx and x86_64]
45+
- 11.0 # [osx and arm64]
4646
cxx_compiler:
47-
- ${{ "gxx" if linux }}
48-
- ${{ "clangxx" if osx }}
49-
- ${{ "vs2019" if win }}
47+
- gxx # [linux]
48+
- clangxx # [osx]
49+
- vs2019 # [win and x86_64]
50+
- vs2022 # [win and arm64]
51+
cxx_compiler_version: # [unix]
52+
- 13 # [linux]
53+
- 18 # [osx]
54+

‎pkg_additional_info.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
desktop:
2+
build_number: 22
3+
desktop_full:
4+
build_number: 22
5+
rqt_common_plugins:
6+
build_number: 22

snapshot_2025-01-10-12-53-33.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-53-33 for distro noetic
12
abb_driver:
23
tag: release/noetic/abb_driver/1.4.0-1
34
url: https://github.com/ros-industrial-release/abb_driver-release.git

‎tests/ros-noetic-desktop-full.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tests:
2+
- package_contents:
3+
files:
4+
- ${{ "Library/" if win }}share/desktop_full/package.xml

‎tests/ros-noetic-desktop.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tests:
2+
- package_contents:
3+
files:
4+
- ${{ "Library/" if win }}share/desktop/package.xml

‎vinca_linux_64.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ conda_index:
66
- robostack.yaml
77
- packages-ignore.yaml
88

9+
# Reminder for next full rebuild, the next build number should be 23
910
build_number: 18
1011

12+
# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
13+
# should be used, not some build number obtained by checking the maximum
14+
# of all build numbers used in the target channel
15+
use_explicit_build_number: true
16+
1117
# Ignore all dependencies of selected packages
1218
skip_all_deps: false
1319

@@ -31,6 +37,10 @@ packages_remove_from_deps:
3137
- libpointmatcher
3238
- roseus
3339
- jskeus
40+
# See https://github.com/RoboStack/ros-noetic/pull/507#issuecomment-2686401205
41+
- rqt_web
42+
- webkit_dependency
43+
3444

3545
build_in_own_azure_stage:
3646
- ros-noetic-jsk-pcl-ros-utils
@@ -1204,3 +1214,4 @@ packages_select_by_deps:
12041214
# - opengm
12051215

12061216
patch_dir: patch
1217+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_linux_aarch64.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ conda_index:
66
- robostack.yaml
77
- packages-ignore.yaml
88

9+
# Reminder for next full rebuild, the next build number should be 23
910
build_number: 12
1011

12+
# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
13+
# should be used, not some build number obtained by checking the maximum
14+
# of all build numbers used in the target channel
15+
use_explicit_build_number: true
16+
1117
# Ignore all dependencies of selected packages
1218
skip_all_deps: false
1319

@@ -27,6 +33,9 @@ packages_remove_from_deps:
2733
- stage
2834
- roseus
2935
- jskeus
36+
# See https://github.com/RoboStack/ros-noetic/pull/507#issuecomment-2686401205
37+
- rqt_web
38+
- webkit_dependency
3039

3140
skip_existing:
3241
# - https://conda.anaconda.org/robostack/
@@ -186,3 +195,4 @@ packages_select_by_deps:
186195
# - velodyne_pointcloud
187196

188197
patch_dir: patch
198+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_osx.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ conda_index:
66
- robostack.yaml
77
- packages-ignore.yaml
88

9+
# Reminder for next full rebuild, the next build number should be 23
910
build_number: 21
1011

12+
# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
13+
# should be used, not some build number obtained by checking the maximum
14+
# of all build numbers used in the target channel
15+
use_explicit_build_number: true
16+
1117
# Ignore all dependencies of selected packages
1218
skip_all_deps: false
1319

@@ -28,6 +34,9 @@ packages_remove_from_deps:
2834
- stage
2935
- roseus
3036
- jskeus
37+
# See https://github.com/RoboStack/ros-noetic/pull/507#issuecomment-2686401205
38+
- rqt_web
39+
- webkit_dependency
3140

3241
skip_existing:
3342
# - https://conda.anaconda.org/robostack/
@@ -881,3 +890,4 @@ packages_select_by_deps:
881890
# - behavior_tree # isn't released?
882891

883892
patch_dir: patch
893+
rosdistro_snapshot: rosdistro_snapshot.yaml

‎vinca_osx_arm64.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ conda_index:
66
- robostack.yaml
77
- packages-ignore.yaml
88

9+
# Reminder for next full rebuild, the next build number should be 23
910
build_number: 9
1011

12+
# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
13+
# should be used, not some build number obtained by checking the maximum
14+
# of all build numbers used in the target channel
15+
use_explicit_build_number: true
16+
1117
# Ignore all dependencies of selected packages
1218
skip_all_deps: false
1319

@@ -27,6 +33,9 @@ packages_remove_from_deps:
2733
- stage
2834
- roseus
2935
- jskeus
36+
# See https://github.com/RoboStack/ros-noetic/pull/507#issuecomment-2686401205
37+
- rqt_web
38+
- webkit_dependency
3039

3140
skip_existing:
3241
# - https://conda.anaconda.org/robostack/
@@ -157,3 +166,4 @@ packages_select_by_deps:
157166
- tf2_web_republisher
158167

159168
patch_dir: patch
169+
rosdistro_snapshot: rosdistro_snapshot.yaml

0 commit comments

Comments
 (0)