Merge pull request #5 from oursland/osx-ci

Christmas 2024 rebuild

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
         python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
     - name: Install vinca
       run: |
-        pip install git+https://github.com/RoboStack/vinca.git@rattler-build
+        pip install git+https://github.com/RoboStack/vinca.git@rattler-build-humble
 
     - name: Generate recipes for linux-64
       run: |

.github/workflows/testpr.yml

@@ -14,6 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, macos-14, windows-2019]
         platform: [linux-64, linux-aarch64, osx-64, win-64, osx-arm64]
+        environment: [beta]
         exclude:
           - os: ubuntu-latest
             platform: win-64
@@ -46,25 +47,25 @@ jobs:
           - os: windows-2019
             platform: osx-arm64
     steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
+        fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
+
+    - uses: prefix-dev/setup-pixi@v0.8.1
+      with:
+        environments: ${{ matrix.environment }}
+        frozen: true
+
     # Workaround for https://github.com/RoboStack/ros-humble/pull/141#issuecomment-1941919816
     - name: Clean up PATH
       if: contains(matrix.os, 'windows')
       uses: egor-tensin/cleanup-path@v4
       with:
         # cygpath in C:\Program Files\Git\usr\bin is used by install micromamba
-        # git in C:\Program Files\Git\bin is used by pip install git+ 
+        # git in C:\Program Files\Git\bin is used by pip install git+
         dirs: 'C:\Program Files\Git\usr\bin;C:\Program Files\Git\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin'
 
-    - uses: actions/checkout@master
-    - name: install micromamba
-      uses: mamba-org/setup-micromamba@main
-      with:
-        environment-file: .github/testpr_environment.yml
-        condarc: |
-          channels:
-            - robostack-staging
-            - conda-forge
-
     - shell: bash -l {0}
       if: matrix.platform == 'linux-aarch64'
       run: |
@@ -81,24 +82,15 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxi-dev libxmu-dev
 
-    - shell: bash -l {0}
-      run: |
-        conda config --show channels | grep defaults && conda config --remove channels defaults
-        conda info
-        conda config --show
-        micromamba install -y pip rospkg networkx "catkin_pkg>=0.4.16" "ruamel.yaml>=0.16.6" "rosdistro>=0.8.0" "empy>=3.3.4" boa
-    - name: install vinca
-      shell: bash -l {0}
-      run: |
-        # use no-deps for now, otherwise problems with ruamel.
-        pip install git+https://github.com/RoboStack/vinca.git --no-deps
     # For some reason, the Strawberry perl's pkg-config is found
     # instead of the conda's one, so let's delete the /c/Strawberry directory
+    # Furthermore, we also need to remove an older SDK that is used and can result in compilation problems
     - name: Debug pkg-config problem
       if: contains(matrix.os, 'windows')
       shell: bash -l {0}
       run: |
         rm -rf /c/Strawberry
+        rm -rf "/c/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/"
 
     - name: Check what files have changed
       id: filecheck
@@ -121,82 +113,80 @@ jobs:
       shell: bash -l {0}
       if: steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-64'
       run: |
-        git clean -fdx
         cp vinca_linux_64.yaml vinca.yaml
-        vinca --platform linux-64
-        ls
-        cat recipe.yaml
+        mkdir -p recipes
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m -n
+        ls -la recipes
     - name: Generate recipes for linux-aarch64
       shell: bash -l {0}
       if: steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-aarch64'
       run: |
-        git clean -fdx
         cp vinca_linux_aarch64.yaml vinca.yaml
-        vinca --platform linux-aarch64
-        ls
-        cat recipe.yaml
+        mkdir -p recipes
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m -n
+        ls -la recipes
     - name: Generate recipes for osx-64
       shell: bash -l {0}
       if: steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.os == 'macos-latest' && matrix.platform == 'osx-64'
       run: |
-        git clean -fdx
         cp vinca_osx.yaml vinca.yaml
-        vinca --platform osx-64
-        ls
-        cat recipe.yaml
+        mkdir -p recipes
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m -n
+        ls -la recipes
     - name: Generate recipes for osx-arm64
       shell: bash -l {0}
       if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-14' && matrix.platform == 'osx-arm64'
       run: |
-        git clean -fdx
         cp vinca_osx_arm64.yaml vinca.yaml
-        vinca --platform osx-arm64
-        ls
-        cat recipe.yaml
+        mkdir -p recipes
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m -n
+        ls -la recipes
     - name: Generate recipes for win-64
       shell: bash -l {0}
       if: steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.os == 'windows-2019' && matrix.platform == 'win-64'
       run: |
-        git clean -fdx
+        # Workaround for problem related to long paths
+        echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
+        mkdir /c/bld
         cp vinca_win.yaml vinca.yaml
-        vinca --platform win-64
-        ls
-        cat recipe.yaml
+        mkdir -p recipes
+        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m -n
+        ls -la recipes
     - name: Check if there are packages to be built
       id: newrecipecheck
       shell: bash -l {0}
       run: |
         # continue on error
         set +e
-        grep -q "outputs: \[\]" recipe.yaml > /dev/null
+        test ! -d recipes
         echo "::set-output name=RECIPE_CREATED::${?}"
     - name: Build recipes for linux-64
       shell: bash -l {0}
-      run: |
-        boa build additional_recipes/ros2-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
-        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-64'
+      run: |
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
     - name: Build recipes for linux-aarch64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-aarch64'
       run: |
-        boa build additional_recipes/ros2-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=linux-aarch64
-        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=linux-aarch64
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
     - name: Build recipes for osx-64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.os == 'macos-latest' && matrix.platform == 'osx-64'
       run: |
-        boa build additional_recipes/ros2-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
-        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
     - name: Build recipes for osx-arm64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-14' && matrix.platform == 'osx-arm64'
       run: |
-        boa build additional_recipes/ros2-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=osx-arm64
-        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
     - name: Build recipes for win-64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.os == 'windows-2019' && matrix.platform == 'win-64'
       run: |
-        boa build additional_recipes/ros2-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
-        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
+        $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing

.gitignore

@@ -8,3 +8,4 @@ recipes/
 # pixi environments
 .pixi
 *.egg-info
+output/

.scripts/build_linux.sh

@@ -20,7 +20,7 @@ pwd
 cd ${FEEDSTOCK_ROOT}
 
 for recipe in ${CURRENT_RECIPES[@]}; do
-	pixi run rattler-build build \
+	pixi run -v rattler-build build \
 		--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
 		-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
 		-c robostack-jazzy -c conda-forge \

.scripts/build_osx.sh

@@ -9,8 +9,11 @@ export "CONDA_BLD_PATH=$HOME/conda-bld/"
 curl -fsSL https://pixi.sh/install.sh | bash
 export PATH="$HOME/.pixi/bin:$PATH"
 
+# Remove homebrew from $PATH
+export PATH=$(echo $PATH | tr ":" "\n" | grep -v 'homebrew' | xargs | tr ' ' ':')
+
 for recipe in ${CURRENT_RECIPES[@]}; do
-	pixi run rattler-build build \
+	pixi run -v rattler-build build \
 		--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
 		-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
 		-c robostack-jazzy -c conda-forge \
@@ -19,4 +22,4 @@ for recipe in ${CURRENT_RECIPES[@]}; do
 	# -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \
 done
 
-pixi run upload ${CONDA_BLD_PATH}/osx-*/*.conda --force
+pixi run upload ${CONDA_BLD_PATH}/osx-*/*.conda --force

.scripts/build_osx_arm64.sh

@@ -9,15 +9,17 @@ export "CONDA_BLD_PATH=$HOME/conda-bld/"
 curl -fsSL https://pixi.sh/install.sh | bash
 export PATH="$HOME/.pixi/bin:$PATH"
 
+# Remove homebrew from $PATH
+export PATH=$(echo $PATH | tr ":" "\n" | grep -v 'homebrew' | xargs | tr ' ' ':')
+
 for recipe in ${CURRENT_RECIPES[@]}; do
-	pixi run rattler-build build \
+	pixi run -v rattler-build build \
 		--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
 		-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
 		-c robostack-jazzy -c conda-forge \
-		--output-dir $CONDA_BLD_PATH \
-		--target-platform=osx-arm64
+		--output-dir $CONDA_BLD_PATH
 
 	# -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \
 done
 
-pixi run upload ${CONDA_BLD_PATH}/osx-*/*.conda --force
+pixi run upload ${CONDA_BLD_PATH}/osx-*/*.conda --force

.scripts/build_win.bat

@@ -16,7 +16,7 @@ reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t
 for %%X in (%CURRENT_RECIPES%) do (
     echo "BUILDING RECIPE %%X"
     cd %FEEDSTOCK_ROOT%\recipes\%%X\
-    pixi run rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^
+    pixi run -v rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^
         -m %FEEDSTOCK_ROOT%\conda_build_config.yaml ^
         -c robostack-jazzy -c conda-forge ^
         --output-dir %CONDA_BLD_PATH%

additional_recipes/ros-jazzy-urdfdom-headers/recipe.yaml

@@ -0,0 +1,20 @@
+package:
+  name: ros-jazzy-urdfdom-headers
+  version: "1.1.2"
+
+build:
+  number: 0
+
+requirements:
+  run:
+    - urdfdom_headers ==1.1.2
+    - python 3.11.* *_cpython
+
+about:
+  homepage: https://github.com/conda-forge/urdfdom_headers-feedstock
+  license: BSD-3-Clause
+  summary: |
+    Headers for URDF parsers
+extra:
+  recipe-maintainers:
+    - ros-forge

additional_recipes/ros-humble-urdfdom-py/recipe.yaml → additional_recipes/ros-jazzy-urdfdom-py/recipe.yaml

@@ -1,13 +1,14 @@
 package:
-  name: ros-humble-urdfdom-py
-  version: "1.2.0"
+  name: ros-jazzy-urdfdom-py
+  version: "1.2.1"
 
 build:
-  number: 2
+  number: 0
 
 requirements:
   run:
-    - urdfdom-py 1.2.0
+    - urdfdom-py 1.2.1.*
+    - python 3.11.* *_cpython
 
 about:
   homepage: https://github.com/ros/urdf_parser_py
@@ -16,4 +17,4 @@ about:
     Standalone URDF parser for Python.
 extra:
   recipe-maintainers:
-    - ros-forge
+    - ros-forge

additional_recipes/ros-jazzy-urdfdom/recipe.yaml

@@ -0,0 +1,20 @@
+package:
+  name: ros-jazzy-urdfdom
+  version: "4.0.1"
+
+build:
+  number: 0
+
+requirements:
+  run:
+    - urdfdom ==4.0.1
+    - python 3.11.* *_cpython
+
+about:
+  homepage: https://github.com/conda-forge/urdfdom-feedstock
+  license: BSD-3-Clause
+  summary: |
+    URDF parser
+extra:
+  recipe-maintainers:
+    - ros-forge