Merge pull request #320 from traversaro/fullrebuild202507

Full Rebuild (Sync) July 2025: bump ros2-distro-mutex to 0.7.0 and build_number to 13

Author: Tobias-Fischer

.github/workflows/main.yml

@@ -24,11 +24,10 @@ 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: |
-        vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes --additional-recipes
+        vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes
     - name: Commit files for linux-64
       run: |
         if [[ -f "linux.yml" ]]; then
@@ -50,11 +49,10 @@ 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: |
-        vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes --additional-recipes
+        vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes
     - name: Commit files for osx-64
       run: |
         if [[ -f "osx.yml" ]]; then
@@ -76,11 +74,10 @@ 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: |
-        vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes --additional-recipes
+        vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes
     - name: Commit files for osx-arm64
       run: |
         if [[ -f "osx_arm64.yml" ]]; then
@@ -102,11 +99,11 @@ 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: |
-        vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes --additional-recipes
+        # --batch_size 10 is a workaround for https://github.com/RoboStack/robostack.github.io/issues/105
+        vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes  --batch_size 10
     - name: Commit files for win-64
       run: |
         if [[ -f "win.yml" ]]; then
@@ -128,11 +125,10 @@ 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: |
-        vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes --additional-recipes
+        vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes
     - name: Commit files for linux-aarch64
       run: |
         if [[ -f "linux_aarch64.yml" ]]; then
@@ -154,13 +150,11 @@ jobs:
     - name: Generate recipes for emscripten-wasm32
       run: |
         git clean -fdx
-        cp vinca_emscripten32.yaml vinca.yaml
         vinca --multiple --platform emscripten-wasm32
-        sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \;'
         
     - name: Generate azure pipelines for emscripten-wasm32
       run: |
-        vinca-gha --platform emscripten-wasm32 --trigger-branch buildbranch_emscripten -d ./recipes --additional-recipes --batch_size 1
+        vinca-gha --platform emscripten-wasm32 --trigger-branch buildbranch_emscripten -d ./recipes --batch_size 1
     - name: Commit files for emscripten-wasm32
       run: |
         if [[ -f "emscripten_wasm32.yml" ]]; then

.github/workflows/testpr.yml

@@ -4,7 +4,8 @@ on:
 
 env:
   ROS_VERSION: 2
-
+  # Change to 'true' to enable the cache upload as artifacts
+  SAVE_CACHE_AS_ARTIFACT: 'false'
 jobs:
   build:
     strategy:
@@ -13,16 +14,22 @@ jobs:
         include:
           - os: ubuntu-latest
             platform: linux-64
+            folder_cache: 'output/linux-64'
           - os: ubuntu-24.04-arm
             platform: linux-aarch64
+            folder_cache: 'output/linux-aarch64'
           - os: macos-13
             platform: osx-64
+            folder_cache: 'output/osx-64'
           - os: macos-14
             platform: osx-arm64
+            folder_cache: 'output/osx-arm64'
           - os: windows-2022
             platform: win-64
+            folder_cache: 'C:/bld/win-64'
           - os: ubuntu-latest
             platform: emscripten-wasm32
+            folder_cache: 'output/emscripten-wasm32'
 
     runs-on: ${{ matrix.os }}
 
@@ -32,11 +39,18 @@ 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.1
+    - uses: prefix-dev/setup-pixi@v0.8.10
       with:
-        environments: beta
         frozen: true
 
+    - name: Long paths workarounds for win-64
+      shell: bash -l {0}
+      if: matrix.platform == 'win-64'
+      run: |
+        # Workaround for problem related to long paths
+        echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
+        mkdir /c/bld
+
     # Workaround for https://github.com/RoboStack/ros-humble/pull/141#issuecomment-1941919816
     - name: Clean up PATH
       if: contains(matrix.os, 'windows')
@@ -56,119 +70,69 @@ jobs:
         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
-      shell: bash -l {0}
-      run: |
-        git fetch origin main
-        # continue on error
-        set +e
-        git diff --exit-code --name-only origin/main -- vinca_linux_64.yaml > /dev/null
-        echo "::set-output name=LINUX_YAML_CHANGED::${?}"
-        git diff --exit-code --name-only origin/main -- vinca_emscripten32.yaml > /dev/null
-        echo "::set-output name=EMSCRIPTEN32_YAML_CHANGED::${?}"
-        git diff --exit-code --name-only origin/main -- vinca_linux_aarch64.yaml > /dev/null
-        echo "::set-output name=LINUX_AARCH_YAML_CHANGED::${?}"
-        git diff --exit-code --name-only origin/main -- vinca_osx.yaml > /dev/null
-        echo "::set-output name=OSX_YAML_CHANGED::${?}"
-        git diff --exit-code --name-only origin/main -- vinca_osx_arm64.yaml > /dev/null
-        echo "::set-output name=OSX_ARM_YAML_CHANGED::${?}"
-        git diff --exit-code --name-only origin/main -- vinca_win.yaml > /dev/null
-        echo "::set-output name=WIN_YAML_CHANGED::${?}"
-    - name: Generate recipes for linux-64
-      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
-        ls -la recipes
-    - name: Generate recipes for emscripten-wasm32
-      shell: bash -l {0}
-      if: steps.filecheck.outputs.EMSCRIPTEN32_YAML_CHANGED == 1 && matrix.platform == 'emscripten-wasm32'
-      run: |
-        cp vinca_emscripten32.yaml vinca.yaml
-        mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -e beta -v vinca --platform emscripten-wasm32 -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
-        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
-        ls -la recipes
-    - name: Generate recipes for osx-arm64
+    # Regression for https://github.com/RoboStack/ros-jazzy/issues/44
+    - name: Check that anaconda-client command works fine
       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
-        ls -la recipes
-    - name: Generate recipes for win-64
+        pixi run anaconda --version
+
+    - name: Generate recipes
       shell: bash -l {0}
-      if: matrix.platform == 'win-64'
       run: |
-        # 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
-        ls -la recipes
-    - name: Check if there are packages to be built
-      id: newrecipecheck
-      shell: bash -l {0}
-      run: |
-        set +e
-        if [ ! -d recipes ] || [ -z "$(ls -A recipes)" ]; then
-          echo "RECIPE_CREATED=0" >> $GITHUB_OUTPUT
-        else
-          echo "RECIPE_CREATED=1" >> $GITHUB_OUTPUT
-        fi
-    - name: Build recipes for linux-64
-      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 rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-staging -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-staging -c conda-forge --skip-existing
-    - name: Build recipes for emscripten-wasm32
+        pixi run -v vinca --platform ${{ matrix.platform }} -m -n
+
+    - name: Check patches
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.EMSCRIPTEN32_YAML_CHANGED == 1 && matrix.platform == 'emscripten-wasm32'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \;'
-        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir ./recipes --target-platform emscripten-wasm32 -m ./conda_build_config.yaml -c https://repo.mamba.pm/emscripten-forge/ -c robostack-staging -c conda-forge --skip-existing --test skip
-    - name: Build recipes for linux-aarch64
+        pixi run python check_patches_clean_apply.py
+
+    - name: Restore build cache
+      id: cache-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          ${{ matrix.folder_cache }}
+        key: ${{ runner.os }}-${{ matrix.platform }}-pr-${{ github.event.pull_request.number }}
+        # allow a later run to pick up a cache that has an extra suffix
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.platform }}-pr-${{ github.event.pull_request.number }}-
+
+    - name: See packages restored by cache
       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 rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-staging -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-staging -c conda-forge --skip-existing
-    - name: Build recipes for osx-64
+        ls ${{ matrix.folder_cache }}
+
+    - name: Build recipes [non emscripten]
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-64'
+      if: matrix.platform != 'emscripten-wasm32'
       run: |
-        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-staging -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-staging -c conda-forge --skip-existing
-    - name: Build recipes for osx-arm64
+        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: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-arm64'
+      if: matrix.platform == 'emscripten-wasm32'
       run: |
-        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-staging -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-staging -c conda-forge --skip-existing
-    - name: Build recipes for win-64
+        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
+
+    - name: See packages that will be saved in cache
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'win-64'
+      if: always()
       run: |
-        $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-staging -c conda-forge --skip-existing
-        $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml --target-platform win-64 -c robostack-staging -c conda-forge --skip-existing
+        ls ${{ matrix.folder_cache }}
+
+    - name: Save build cache
+      uses: actions/cache/save@v4
+      if: always()
+      with:
+        path: |
+          ${{ matrix.folder_cache }}
+        key: ${{ runner.os }}-${{ matrix.platform }}-pr-${{ github.event.pull_request.number }}-${{ github.run_id }}-${{ github.run_attempt }}
+
+    - name: Upload build cache as artifact
+      if: ${{ always() && env.SAVE_CACHE_AS_ARTIFACT == 'true' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: cache-${{ matrix.platform }}-${{ github.run_id }}
+        path: ${{ matrix.folder_cache }}
+        retention-days: 7

.gitignore

@@ -1,8 +1,5 @@
-vinca.yaml
 recipes/
-*.bat
-*.sh
-*.ps1
+recipes_only_patch/
 *.json
 .DS_Store
 # pixi environments

.scripts/build_unix.sh

@@ -40,7 +40,7 @@ for recipe in ${CURRENT_RECIPES[@]}; do
 	pixi run -v rattler-build build \
 		--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
 		-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
-		-c robostack-staging -c conda-forge \
+		-c conda-forge -c robostack-staging \
 		${extra_channel} \
 		--output-dir $CONDA_BLD_PATH \
 		${cross_compile}

.scripts/build_win.bat

@@ -18,7 +18,7 @@ for %%X in (%CURRENT_RECIPES%) do (
     cd %FEEDSTOCK_ROOT%\recipes\%%X\
     pixi run -v rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^
         -m %FEEDSTOCK_ROOT%\conda_build_config.yaml ^
-        -c robostack-staging -c conda-forge ^
+        -c conda-forge -c robostack-staging ^
         --output-dir %CONDA_BLD_PATH%
 
     if errorlevel 1 exit 1