Sync with humble/jazzy

RoboStack · Jan 10, 2025 · 49269e6 · 49269e6
1 parent 33d3128
commit 49269e6
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 933 deletions.
diff --git a/.ci_support/conda_forge_pinnings.yaml b/.ci_support/conda_forge_pinnings.yaml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -133,7 +133,7 @@ jobs:
         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 --batch_size 1
+        vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes --additional-recipes
     - name: Commit files for linux-aarch64
       run: |
         if [[ -f "linux_aarch64.yml" ]]; then

diff --git a/conda_build_config.yaml b/conda_build_config.yaml
@@ -31,11 +31,6 @@ python:
 python_impl:
   - cpython
 
-c_compiler:
-  - ${{ "vs2019" if win }}
-cxx_compiler:
-  - ${{ "vs2019" if win }}
-
 c_stdlib:
   - ${{ "sysroot" if linux }}
   - ${{ "macosx_deployment_target" if osx }}
@@ -44,3 +39,11 @@ c_stdlib_version:
   - ${{ "2.17" if linux }}
   - ${{ "10.14" if osx and x86_64 }}
   - ${{ "11.0" if osx and arm64 }}
+c_compiler:
+  - ${{ "gcc" if linux }}
+  - ${{ "clang" if osx }}
+  - ${{ "vs2019" if win }}
+cxx_compiler:
+  - ${{ "gxx" if linux }}
+  - ${{ "clangxx" if osx }}
+  - ${{ "vs2019" if win }}
diff --git a/conda_build_config_old_linux_compiler.yaml b/conda_build_config_old_linux_compiler.yaml
diff --git a/conda_build_config_old_osx.yaml b/conda_build_config_old_osx.yaml
diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -16,7 +16,7 @@ upload = "anaconda -t $ANACONDA_API_TOKEN upload"
 
 [dependencies]
 python = ">=3.11.0,<3.12"
-rattler-build = ">=0.33"
+rattler-build = ">=0.33.2"
 anaconda-client = ">=1.12"
 
 [target.win-64.dependencies]
@@ -36,8 +36,8 @@ vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "c47948cdec7d20d4
 generate-recipes = { cmd = "vinca -m", depends_on = ["rename-file"] }
 remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
 copy_additional_recipes = { cmd = "sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \\;'" }
-build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml --skip-existing", depends_on = ["generate-recipes", "copy_additional_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", env = { PACKAGE = "ros-noetic-ros-base" } }
+build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends_on = ["generate-recipes", "copy_additional_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 robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-noetic-ros-base" } }
 
 [environments]
 beta = ["beta"]

diff --git a/robostack.yaml b/robostack.yaml
@@ -90,8 +90,15 @@ festival:
     linux: [festival, festvox-kallpc16k]
     osx: []
     win64: []
+# This is not available on Windows, and it is only
+# required by libcurl_vendor (see https://index.ros.org/d/file/)
+# but it is not actually used if libcurl is not compiled,
+# so we can just ignore it on Windows.
 file:
-  robostack: [file]
+  robostack:
+    linux: [file]
+    osx: [file]
+    win64: []
 ffmpeg:
   robostack: [ffmpeg]
 ffmpeg-dev:
@@ -261,7 +268,7 @@ libcurl-dev:
 libdc1394-dev:
   robostack: [libdc1394]
 libdw-dev:
-  conda:
+  robostack:
     linux: [elfutils]
     osx: []
     win64: []
@@ -542,7 +549,7 @@ netpbm:
     linux-aarch64: []
     osx-arm64: []
     linux: [netpbm]
-    osx: []
+    osx: [netpbm]
     win64: []
 nlohmann-json-dev:
   robostack: [nlohmann_json]