Skip to content

Commit 4d46f5d

Browse files
committed
Switch to load snapshot file via vinca.yaml file
1 parent 84a34b9 commit 4d46f5d

File tree

8 files changed

+20
-14
lines changed

8 files changed

+20
-14
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
git clean -fdx
2828
cp vinca_linux_64.yaml vinca.yaml
29-
vinca --multiple --platform linux-64 --snapshot rosdistro_snapshot.yaml
29+
vinca --multiple --platform linux-64
3030
- name: Generate azure pipelines for linux-64
3131
run: |
3232
vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes --additional-recipes
@@ -52,7 +52,7 @@ jobs:
5252
run: |
5353
git clean -fdx
5454
cp vinca_osx.yaml vinca.yaml
55-
vinca --multiple --platform osx-64 --snapshot rosdistro_snapshot.yaml
55+
vinca --multiple --platform osx-64
5656
- name: Generate azure pipelines for osx-64
5757
run: |
5858
vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes --additional-recipes
@@ -78,7 +78,7 @@ jobs:
7878
run: |
7979
git clean -fdx
8080
cp vinca_osx_arm64.yaml vinca.yaml
81-
vinca --multiple --platform osx-arm64 --snapshot rosdistro_snapshot.yaml
81+
vinca --multiple --platform osx-arm64
8282
- name: Generate azure pipelines for osx-arm64
8383
run: |
8484
vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes --additional-recipes
@@ -104,7 +104,7 @@ jobs:
104104
run: |
105105
git clean -fdx
106106
cp vinca_win.yaml vinca.yaml
107-
vinca --multiple --platform win-64 --snapshot rosdistro_snapshot.yaml
107+
vinca --multiple --platform win-64
108108
- name: Generate azure pipelines for win-64
109109
run: |
110110
vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes --additional-recipes
@@ -130,7 +130,7 @@ jobs:
130130
run: |
131131
git clean -fdx
132132
cp vinca_linux_aarch64.yaml vinca.yaml
133-
vinca --multiple --platform linux-aarch64 --snapshot rosdistro_snapshot.yaml
133+
vinca --multiple --platform linux-aarch64
134134
- name: Generate azure pipelines for linux-aarch64
135135
run: |
136136
vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes --additional-recipes

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ 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 = "8a559c7939b4034469c787b7ad57a448870169ce" }
30+
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "a081fad2b1d72cfa4c3cc30010dae024ade79d0c" }
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]
36-
generate-recipes = { cmd = "vinca -m --snapshot rosdistro_snapshot.yaml", depends_on = ["rename-file"] }
36+
generate-recipes = { cmd = "vinca -m", depends_on = ["rename-file"] }
3737
remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
3838
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml --skip-existing" }
3939
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"] }

vinca_linux_64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ packages_select_by_deps:
6363
- gtsam
6464

6565
patch_dir: patch
66+
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_linux_aarch64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ packages_select_by_deps:
6363
- gtsam
6464

6565
patch_dir: patch
66+
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_osx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ packages_select_by_deps:
7373
- gtsam
7474

7575
patch_dir: patch
76+
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_osx_arm64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ packages_select_by_deps:
7373
- gtsam
7474

7575
patch_dir: patch
76+
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_win.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ packages_select_by_deps:
6767
- apriltag_ros
6868

6969
- ackermann-msgs
70-
- velodyne
70+
# velodyne packages are not supported on Windows
71+
# - velodyne
7172
- sbg_driver
7273
# Commented out as in the next rebuild on Windows we will switch to use the conda-forge version
7374
#- gtsam
7475

7576
patch_dir: patch
77+
rosdistro_snapshot: rosdistro_snapshot.yaml
7678

0 commit comments

Comments
 (0)