Merge pull request #244 from RoboStack/rebuildlanelet2withcorrectpugixml

Rebuild lanelet2-io with correct pugixml and ros-humble-ros-workspace with fastrtps fix

Author: Tobias-Fischer

.github/workflows/testpr.yml

@@ -94,31 +94,31 @@ jobs:
       run: |
         cp vinca_linux_64.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m -n
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m
         ls -la recipes
     - name: Generate recipes for linux-aarch64
       shell: bash -l {0}
       if: steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.platform == 'linux-aarch64'
       run: |
         cp vinca_linux_aarch64.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m -n
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m
         ls -la recipes
     - name: Generate recipes for osx-64
       shell: bash -l {0}
       if: steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.platform == 'osx-64'
       run: |
         cp vinca_osx.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m -n
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m
         ls -la recipes
     - name: Generate recipes for osx-arm64
       shell: bash -l {0}
       if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.platform == 'osx-arm64'
       run: |
         cp vinca_osx_arm64.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m -n
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m
         ls -la recipes
     - name: Generate recipes for win-64
       shell: bash -l {0}
@@ -129,7 +129,7 @@ jobs:
         mkdir /c/bld
         cp vinca_win.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m -n
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m
         ls -la recipes
     - name: Check if there are packages to be built
       id: newrecipecheck

conda_build_config.yaml

@@ -6,6 +6,8 @@ protobuf:
   - 5.28.2
 spdlog:
   - 1.14
+pugixml:
+  - '1.14'
 
 cdt_name:
   - ${{ "cos7" if linux }}

pixi.lock

@@ -27,7 +27,7 @@ git = "*"
 
 [feature.beta.pypi-dependencies]
 # This is tipically the latest commit on main branch
-vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "aa102b280adcad0374e4d231b25d21bf0db27d61" }
+vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "d6e024976249858f25eb0ae07d2c2a46892920d6" }
 # 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 }

pixi.toml

@@ -0,0 +1,4 @@
+lanelet2_io:
+  build_number: 9
+ros_workspace:
+  build_number: 9

pkg_additional_info.yaml

@@ -5,8 +5,14 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
+# Reminder for next full rebuild, the next build number should be 10
 build_number: 7
 
+# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
+# should be used, not some build number obtained by checking the maximum
+# of all build numbers used in the target channel
+use_explicit_build_number: true
+
 mutex_package: ros2-distro-mutex 0.6.* humble_*
 
 skip_all_deps: false

vinca_linux_64.yaml

@@ -5,8 +5,14 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
+# Reminder for next full rebuild, the next build number should be 10
 build_number: 5
 
+# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
+# should be used, not some build number obtained by checking the maximum
+# of all build numbers used in the target channel
+use_explicit_build_number: true
+
 mutex_package: ros2-distro-mutex 0.6.* humble_*
 
 skip_all_deps: false

vinca_linux_aarch64.yaml

@@ -5,8 +5,14 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
+# Reminder for next full rebuild, the next build number should be 10
 build_number: 7
 
+# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
+# should be used, not some build number obtained by checking the maximum
+# of all build numbers used in the target channel
+use_explicit_build_number: true
+
 mutex_package: ros2-distro-mutex 0.6.* humble_*
 
 skip_all_deps: false

vinca_osx.yaml

@@ -5,8 +5,14 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
+# Reminder for next full rebuild, the next build number should be 10
 build_number: 6
 
+# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
+# should be used, not some build number obtained by checking the maximum
+# of all build numbers used in the target channel
+use_explicit_build_number: true
+
 mutex_package: ros2-distro-mutex 0.6.* humble_*
 
 skip_all_deps: false

vinca_osx_arm64.yaml

@@ -5,8 +5,14 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
+# Reminder for next full rebuild, the next build number should be 10
 build_number: 8
 
+# Specify that exactly the build_number used vinca*.yaml or pkg_additional_info.yaml
+# should be used, not some build number obtained by checking the maximum
+# of all build numbers used in the target channel
+use_explicit_build_number: true
+
 mutex_package: ros2-distro-mutex 0.6.* humble_*
 
 skip_all_deps: false