Switch to load snapshot file via vinca.yaml file

RoboStack · Jan 20, 2025 · 4d46f5d · 4d46f5d
1 parent 84a34b9
commit 4d46f5d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       run: |
         git clean -fdx
         cp vinca_linux_64.yaml vinca.yaml
-        vinca --multiple --platform linux-64 --snapshot rosdistro_snapshot.yaml
+        vinca --multiple --platform linux-64
     - name: Generate azure pipelines for linux-64
       run: |
         vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes --additional-recipes
@@ -52,7 +52,7 @@ jobs:
       run: |
         git clean -fdx
         cp vinca_osx.yaml vinca.yaml
-        vinca --multiple --platform osx-64 --snapshot rosdistro_snapshot.yaml
+        vinca --multiple --platform osx-64
     - name: Generate azure pipelines for osx-64
       run: |
         vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes --additional-recipes
@@ -78,7 +78,7 @@ jobs:
       run: |
         git clean -fdx
         cp vinca_osx_arm64.yaml vinca.yaml
-        vinca --multiple --platform osx-arm64 --snapshot rosdistro_snapshot.yaml
+        vinca --multiple --platform osx-arm64
     - name: Generate azure pipelines for osx-arm64
       run: |
         vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes --additional-recipes
@@ -104,7 +104,7 @@ jobs:
       run: |
         git clean -fdx
         cp vinca_win.yaml vinca.yaml
-        vinca --multiple --platform win-64 --snapshot rosdistro_snapshot.yaml
+        vinca --multiple --platform win-64
     - name: Generate azure pipelines for win-64
       run: |
         vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes --additional-recipes
@@ -130,7 +130,7 @@ jobs:
       run: |
         git clean -fdx
         cp vinca_linux_aarch64.yaml vinca.yaml
-        vinca --multiple --platform linux-aarch64 --snapshot rosdistro_snapshot.yaml
+        vinca --multiple --platform linux-aarch64
     - name: Generate azure pipelines for linux-aarch64
       run: |
         vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes --additional-recipes

diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -27,13 +27,13 @@ git = "*"
 
 [feature.beta.pypi-dependencies]
 # This is tipically the latest commit on main branch
-vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "8a559c7939b4034469c787b7ad57a448870169ce" }
+vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "a081fad2b1d72cfa4c3cc30010dae024ade79d0c" }
 # 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 --snapshot rosdistro_snapshot.yaml", depends_on = ["rename-file"] }
+generate-recipes = { cmd = "vinca -m", depends_on = ["rename-file"] }
 remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
 build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml --skip-existing" }
 build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-jazzy -c https://repo.prefix.dev/conda-forge --skip-existing", depends_on = ["build_additional_recipes", "generate-recipes"] }

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -63,3 +63,4 @@ packages_select_by_deps:
   - gtsam
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -63,3 +63,4 @@ packages_select_by_deps:
   - gtsam
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -73,3 +73,4 @@ packages_select_by_deps:
   - gtsam
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -73,3 +73,4 @@ packages_select_by_deps:
   - gtsam
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -67,10 +67,12 @@ packages_select_by_deps:
   - apriltag_ros
 
   - ackermann-msgs
-  - velodyne
+  # velodyne packages are not supported on Windows
+  # - velodyne
   - sbg_driver
   # Commented out as in the next rebuild on Windows we will switch to use the conda-forge version
   #- gtsam
 
 patch_dir: patch
+rosdistro_snapshot: rosdistro_snapshot.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,3 +63,4 @@ packages_select_by_deps:
		- gtsam

		patch_dir: patch
		rosdistro_snapshot: rosdistro_snapshot.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,3 +73,4 @@ packages_select_by_deps:
		- gtsam

		patch_dir: patch
		rosdistro_snapshot: rosdistro_snapshot.yaml