From 4d46f5d2be9e2c23432bd769ccc8af01c72e0e48 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 20 Jan 2025 23:18:36 +0100 Subject: [PATCH] Switch to load snapshot file via vinca.yaml file --- .github/workflows/main.yml | 10 +++++----- pixi.lock | 12 ++++++------ pixi.toml | 4 ++-- vinca_linux_64.yaml | 1 + vinca_linux_aarch64.yaml | 1 + vinca_osx.yaml | 1 + vinca_osx_arm64.yaml | 1 + vinca_win.yaml | 4 +++- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb5a5c7..c177172 100644 --- 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 index a512fdd..03a9220 100644 --- a/pixi.lock +++ b/pixi.lock @@ -88,7 +88,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/6e/264c50ce2a31473a9fdbf4fa66ca9b2b17c7455b31ef585462343818bd6c/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8a559c7939b4034469c787b7ad57a448870169ce + - pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c linux-aarch64: - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda @@ -170,7 +170,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3c/d2/b79b7d695e2f21da020bd44c782490578f300dd44f0a4c57a92575758a76/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux2014_aarch64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8a559c7939b4034469c787b7ad57a448870169ce + - pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c osx-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -242,7 +242,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/84/80203abff8ea4993a87d823a5f632e4d92831ef75d404c9fc78d0176d2b5/ruamel.yaml.clib-0.2.12.tar.gz - - pypi: git+https://github.com/RoboStack/vinca.git@8a559c7939b4034469c787b7ad57a448870169ce + - pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c osx-arm64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -314,7 +314,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fb/8f/683c6ad562f558cbc4f7c029abcd9599148c51c54b5ef0f24f2638da9fbb/ruamel.yaml.clib-0.2.12-cp311-cp311-macosx_13_0_arm64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8a559c7939b4034469c787b7ad57a448870169ce + - pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c win-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -394,7 +394,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/4f/b52f634c9548a9291a70dfce26ca7ebce388235c93588a1068028ea23fcc/ruamel.yaml.clib-0.2.12-cp311-cp311-win_amd64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8a559c7939b4034469c787b7ad57a448870169ce + - pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c default: channels: - url: https://repo.prefix.dev/conda-forge/ @@ -2804,7 +2804,7 @@ packages: purls: [] size: 754247 timestamp: 1731710681163 -- pypi: git+https://github.com/RoboStack/vinca.git@8a559c7939b4034469c787b7ad57a448870169ce +- pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c name: vinca version: 0.0.4 requires_dist: diff --git a/pixi.toml b/pixi.toml index 4d9bc08..df6636e 100644 --- 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 index 4f96d68..1608421 100644 --- 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 index 4f96d68..1608421 100644 --- 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 index bd988be..f8b0bbf 100644 --- 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 index e1a2a03..ffd0d8d 100644 --- 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 index 26fdcf9..131f435 100644 --- 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