Merge pull request #79 from RoboStack/cleanupjune25

Cleanup pixi.toml, consolidate vinca.yaml in a single file and cleanup build of livox-ros-driver2

Author: Tobias-Fischer

.github/workflows/main.yml

@@ -25,7 +25,6 @@ jobs:
     - name: Generate recipes for linux-64
       run: |
         git clean -fdx
-        cp vinca_linux_64.yaml vinca.yaml
         vinca --multiple --platform linux-64
     - name: Generate azure pipelines for linux-64
       run: |
@@ -51,7 +50,6 @@ jobs:
     - name: Generate recipes for osx-64
       run: |
         git clean -fdx
-        cp vinca_osx.yaml vinca.yaml
         vinca --multiple --platform osx-64
     - name: Generate azure pipelines for osx-64
       run: |
@@ -77,7 +75,6 @@ jobs:
     - name: Generate recipes for osx-arm64
       run: |
         git clean -fdx
-        cp vinca_osx_arm64.yaml vinca.yaml
         vinca --multiple --platform osx-arm64
     - name: Generate azure pipelines for osx-arm64
       run: |
@@ -103,7 +100,6 @@ jobs:
     - name: Generate recipes for win-64
       run: |
         git clean -fdx
-        cp vinca_win.yaml vinca.yaml
         vinca --multiple --platform win-64
     - name: Generate azure pipelines for win-64
       run: |
@@ -129,7 +125,6 @@ jobs:
     - name: Generate recipes for linux-aarch64
       run: |
         git clean -fdx
-        cp vinca_linux_aarch64.yaml vinca.yaml
         vinca --multiple --platform linux-aarch64
     - name: Generate azure pipelines for linux-aarch64
       run: |

.github/workflows/testpr.yml

@@ -13,21 +13,14 @@ jobs:
         include:
           - os: ubuntu-latest
             platform: linux-64
-            additional_recipes:
-              - "ros-jazzy-livox-ros-driver2"
           - os: ubuntu-24.04-arm
             platform: linux-aarch64
-            additional_recipes: 
-              - "ros-jazzy-livox-ros-driver2"
           - os: macos-13
             platform: osx-64
-            additional_recipes: []
           - os: macos-14
             platform: osx-arm64
-            additional_recipes: []
           - os: windows-2022
             platform: win-64
-            additional_recipes: []
 
     runs-on: ${{ matrix.os }}
 
@@ -37,10 +30,9 @@ jobs:
         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.8
+    - uses: prefix-dev/setup-pixi@v0.8.10
       with:
         pixi-version: v0.44.0
-        environments: beta
         frozen: true
 
     # Workaround for https://github.com/RoboStack/ros-humble/pull/141#issuecomment-1941919816
@@ -73,33 +65,29 @@ jobs:
       shell: bash -l {0}
       if: matrix.platform == 'linux-64'
       run: |
-        cp vinca_linux_64.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m -n
+        $HOME/.pixi/bin/pixi run -v vinca --platform linux-64 -m -n
         ls -la recipes
     - name: Generate recipes for linux-aarch64
       shell: bash -l {0}
       if: matrix.platform == 'linux-aarch64'
       run: |
-        cp vinca_linux_aarch64.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m -n
+        $HOME/.pixi/bin/pixi run -v vinca --platform linux-aarch64 -m -n
         ls -la recipes
     - name: Generate recipes for osx-64
       shell: bash -l {0}
       if: matrix.platform == 'osx-64'
       run: |
-        cp vinca_osx.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m -n
+        $HOME/.pixi/bin/pixi run -v vinca --platform osx-64 -m -n
         ls -la recipes
     - name: Generate recipes for osx-arm64
       shell: bash -l {0}
       if: matrix.platform == 'osx-arm64'
       run: |
-        cp vinca_osx_arm64.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m -n
+        $HOME/.pixi/bin/pixi run -v vinca --platform osx-arm64 -m -n
         ls -la recipes
     - name: Generate recipes for win-64
       shell: bash -l {0}
@@ -108,14 +96,9 @@ jobs:
         # Workaround for problem related to long paths
         echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
         mkdir /c/bld
-        cp vinca_win.yaml vinca.yaml
         mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m -n
+        $HOME/.pixi/bin/pixi run -v vinca --platform win-64 -m -n
         ls -la recipes
-    - name: Copy additional recipes which have been changed into recipes
-      shell: bash -l {0}
-      run: |
-        echo '${{ toJson(matrix.additional_recipes) }}' | jq -r ".[]" | xargs -I@ cp -r additional_recipes/@ recipes/
     - name: Check if there are packages to be built
       id: newrecipecheck
       shell: bash -l {0}
@@ -131,34 +114,34 @@ jobs:
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -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 --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
+        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform linux-64 -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 && matrix.platform == 'linux-aarch64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -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 --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
+        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform linux-aarch64 -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 && matrix.platform == 'osx-64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform osx-64 -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 --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
+        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform osx-64 -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 && matrix.platform == 'osx-arm64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform osx-arm64 -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 --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
+        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform osx-arm64 -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 && matrix.platform == 'win-64'
       run: |
-        $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
-        # $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform win-64 -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 --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
+        # $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
+        $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing

.gitignore

@@ -1,4 +1,3 @@
-vinca.yaml
 recipes/
 *.bat
 *.sh