Merge pull request #393 from RoboStack/apriltag-unvendor

unvendor apriltag

Author: Tobias-Fischer

.github/workflows/testpr.yml

@@ -93,7 +93,11 @@ jobs:
     - name: Check patches
       shell: bash -l {0}
       run: |
-        pixi run check-patches
+        if [ "${{ matrix.platform }}" = "emscripten-wasm32" ]; then
+          pixi run check-patches-emscripten
+        else
+          pixi run check-patches
+        fi
 
     - name: Restore build cache
       id: cache-restore
@@ -124,20 +128,17 @@ jobs:
       run: |
         ls ${{ matrix.folder_cache }} || true
 
-    - name: Build recipes [non emscripten]
+    - name: Build recipes
       shell: bash -l {0}
-      if: matrix.platform != 'emscripten-wasm32'
       run: |
         if [ "${{ runner.os }}" = "Windows" ]; then
           export VINCA_CUSTOM_CMAKE_BUILD_DIR='C:\x\'
         fi
-        pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-staging --skip-existing
-
-    - name: Build recipes [emscripten]
-      shell: bash -l {0}
-      if: matrix.platform == 'emscripten-wasm32'
-      run: |
-        pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://repo.mamba.pm/emscripten-forge/ -c conda-forge -c robostack-staging --skip-existing --test skip
+        if [ "${{ matrix.platform }}" = "emscripten-wasm32" ]; then
+          pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://repo.mamba.pm/emscripten-forge/ -c conda-forge -c robostack-staging --skip-existing --test skip
+        else
+          pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-staging --skip-existing
+        fi
 
     - name: See packages that will be saved in cache
       shell: bash -l {0}

conda_build_config.yaml

@@ -82,3 +82,6 @@ libzenohcxx:
 
 libhwloc:
   - 2.12.2
+
+eigen_abi_devel:
+  - '3.4.0'

pixi.toml

@@ -30,18 +30,29 @@ vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "86e2ac4935d39b3
 #vinca = { path = "../vinca", editable = true }
 
 [tasks]
-upload = "rattler-build upload anaconda -o robostack-staging -a $ANACONDA_API_TOKEN"
 generate-recipes = { cmd = "vinca -m", depends-on = ["remove-recipes"] }
+generate-gha-workflows = { cmd = "vinca-gha --trigger-branch dummy_build_branch_as_it_is_unused -d ./recipes", depends-on = ["generate-recipes"] }
 check-patches = { cmd = "python check_patches_clean_apply.py", depends-on = ["generate-recipes"] }
+create_snapshot = { cmd = "vinca-snapshot -d humble -o rosdistro_snapshot.yaml" }
+upload = "rattler-build upload anaconda -o robostack-staging -a $ANACONDA_API_TOKEN"
+build_continue_on_failure = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c conda-forge -c robostack-staging --continue-on-failure --skip-existing", depends-on = ["generate-recipes"] }
+
 generate-recipes-emscripten = { cmd = "vinca -m --platform emscripten-wasm32", depends-on = ["remove-recipes"] }
 check-patches-emscripten = { cmd = "python check_patches_clean_apply.py", depends-on = ["generate-recipes-emscripten"] }
-remove-recipes = { cmd = "rm -rf recipes_only_patch; rm -rf recipes; mkdir recipes" }
-generate-gha-workflows = { cmd = "vinca-gha --trigger-branch dummy_build_branch_as_it_is_unused -d ./recipes", depends-on = ["generate-recipes"] }
-build_continue_on_failure = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c conda-forge -c robostack-staging --continue-on-failure --skip-existing", depends-on = ["generate-recipes"] }
-build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c https://repo.prefix.dev/conda-forge -c robostack-staging  --skip-existing", depends-on = ["generate-recipes"] }
-build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c https://repo.prefix.dev/conda-forge -c robostack-staging", env = { PACKAGE = "ros-humble-ros-workspace" } }
-create_snapshot = { cmd = "vinca-snapshot -d humble -o rosdistro_snapshot.yaml" }
 
+[tasks.build]
+cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c https://repo.prefix.dev/conda-forge -c robostack-staging --skip-existing"
+depends-on = ["generate-recipes"]
+description = "Build all packages, from the ./recipes dir. This will skip already existing packages, so it can be used to build only a subset of packages by first removing the recipes of the packages you want to rebuild (see `pixi remove-recipes`)."
+
+[tasks.remove-recipes]
+cmd = "rm -rf recipes_only_patch; rm -rf recipes; mkdir recipes"
+description = "Remove all generated recipes, before regenerating them."
+
+[tasks.build-one]
+cmd = "cp ./patch/{{ PACKAGE }}.*patch ./recipes/{{ PACKAGE }}/patch/; rattler-build build --recipe ./recipes/{{ PACKAGE }}/recipe.yaml -m ./conda_build_config.yaml -c https://repo.prefix.dev/conda-forge -c robostack-staging"
+args = [{ arg = "PACKAGE", default = "ros-humble-ros-workspace" }]
+description = "Build a single package, from the ./recipes dir. Add the `ros-humble-` prefix to the package name, e.g. `pixi build-one --package ros-humble-ros-workspace`"
 
 [tasks.build-emscripten]
   cmd = [

pkg_additional_info.yaml

@@ -157,3 +157,22 @@ proxsuite:
     dep_name: proxsuite
     max_pin: 'x.x'
     override_version: '0.7.2'
+
+# remember on next rebuild to remove build number override
+apriltag:
+  build_number: 16
+  generate_dummy_package_with_run_deps:
+    dep_name: apriltag
+    max_pin: 'x.x.x'
+apriltag_ros:
+  build_number: 16
+apriltag_draw:
+  build_number: 16
+apriltag_tools:
+  build_number: 16
+apriltag_detector_umich:
+  build_number: 16
+apriltag_detector_mit:
+  build_number: 16
+apriltag_detector:
+  build_number: 16

robostack.yaml

@@ -81,7 +81,7 @@ doxygen:
 draco:
   robostack: [draco]
 eigen:
-  robostack: [eigen]
+  robostack: [eigen, eigen-abi-devel]
 emacs:
   robostack: [emacs]
 festival:

vinca.yaml

@@ -5,7 +5,7 @@ conda_index:
   - robostack.yaml
   - packages-ignore.yaml
 
-# Reminder for next full rebuild, the next build number should be 16
+# Reminder for next full rebuild, the next build number should be 17
 build_number: 15
 
 mutex_package: