Skip to content

Commit e53d840

Browse files
authored
Merge pull request #34 from wep21/rebuild-202508
Full rebuild September 2025 bump ros2-distro-mutex to 0.11.0 and build number to 12
2 parents fd14859 + 6a3ebfc commit e53d840

33 files changed

+2035
-1551
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: Install vinca
2222
run: |
2323
pip install git+https://github.com/RoboStack/vinca.git
24-
2524
- name: Generate recipes for linux-64
2625
run: |
2726
git clean -fdx

.github/workflows/testpr.yml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44

55
env:
66
ROS_VERSION: 2
7+
# Change to 'true' to enable the cache upload as artifacts
8+
SAVE_CACHE_AS_ARTIFACT: 'false'
9+
# Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging
10+
IGNORE_CACHE_AND_DO_FULL_REBUILD: 'false'
711

812
jobs:
913
build:
@@ -13,26 +17,30 @@ jobs:
1317
include:
1418
- os: ubuntu-latest
1519
platform: linux-64
20+
folder_cache: 'output/linux-64'
1621
- os: ubuntu-24.04-arm
1722
platform: linux-aarch64
23+
folder_cache: 'output/linux-aarch64'
1824
- os: macos-13
1925
platform: osx-64
26+
folder_cache: 'output/osx-64'
2027
- os: macos-14
2128
platform: osx-arm64
29+
folder_cache: 'output/osx-arm64'
2230
- os: windows-2022
2331
platform: win-64
32+
folder_cache: 'C:/bld/win-64'
2433

2534
runs-on: ${{ matrix.os }}
2635

2736
steps:
28-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
2938
with:
3039
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
3140
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
3241

3342
- uses: prefix-dev/[email protected]
3443
with:
35-
pixi-version: v0.44.0
3644
frozen: true
3745

3846
# Workaround for https://github.com/RoboStack/ros-humble/pull/141#issuecomment-1941919816
@@ -79,7 +87,51 @@ jobs:
7987
run: |
8088
pixi run python check_patches_clean_apply.py
8189
90+
- name: Restore build cache
91+
id: cache-restore
92+
uses: actions/cache/restore@v4
93+
with:
94+
path: |
95+
${{ matrix.folder_cache }}
96+
key: ${{ runner.os }}-${{ matrix.platform }}-pr-${{ github.event.pull_request.number }}
97+
# allow a later run to pick up a cache that has an extra suffix
98+
restore-keys: |
99+
${{ runner.os }}-${{ matrix.platform }}-pr-${{ github.event.pull_request.number }}-
100+
101+
- name: Optional force full rebuild
102+
if: ${{ env.IGNORE_CACHE_AND_DO_FULL_REBUILD == 'true' }}
103+
shell: bash -l {0}
104+
run: |
105+
rm -rf ${{ matrix.folder_cache }}/*
106+
107+
- name: See packages restored by cache
108+
shell: bash -l {0}
109+
run: |
110+
ls ${{ matrix.folder_cache }} || true
111+
82112
- name: Build recipes
83113
shell: bash -l {0}
84114
run: |
85115
pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
116+
117+
- name: See packages that will be saved in cache
118+
shell: bash -l {0}
119+
if: always()
120+
run: |
121+
ls ${{ matrix.folder_cache }} || true
122+
123+
- name: Save build cache
124+
uses: actions/cache/save@v4
125+
if: always()
126+
with:
127+
path: |
128+
${{ matrix.folder_cache }}
129+
key: ${{ runner.os }}-${{ matrix.platform }}-pr-${{ github.event.pull_request.number }}-${{ github.run_id }}-${{ github.run_attempt }}
130+
131+
- name: Upload build cache as artifact
132+
if: ${{ always() && env.SAVE_CACHE_AS_ARTIFACT == 'true' }}
133+
uses: actions/upload-artifact@v4
134+
with:
135+
name: cache-${{ matrix.platform }}-${{ github.run_id }}
136+
path: ${{ matrix.folder_cache }}
137+
retention-days: 7

.scripts/build_unix.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@ if [[ "$target" == *"osx"* ]]; then
2626
export PATH=$(echo $PATH | tr ":" "\n" | grep -v 'homebrew' | xargs | tr ' ' ':')
2727
fi
2828

29-
extra_channel=""
30-
cross_compile=""
29+
if [[ "$target" == "emscripten-wasm32" ]]; then
30+
extra_channel="-c https://repo.mamba.pm/emscripten-forge"
31+
cross_compile="--target-platform emscripten-wasm32 --test skip"
32+
33+
else
34+
extra_channel=""
35+
cross_compile=""
36+
fi
37+
3138

3239
for recipe in ${CURRENT_RECIPES[@]}; do
3340
pixi run -v rattler-build build \

.scripts/build_win.bat

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,14 @@ for %%X in (%CURRENT_RECIPES%) do (
2525
rem -m %FEEDSTOCK_ROOT%\.ci_support\conda_forge_pinnings.yaml
2626
)
2727

28-
pixi run upload "%CONDA_BLD_PATH%\win-64\*.conda" --force
29-
if errorlevel 1 exit 1
28+
:: Check if .conda files exist in the win-64 directory
29+
dir /b "%CONDA_BLD_PATH%\win-64\*.conda" >nul 2>&1
30+
if errorlevel 1 (
31+
:: No files found, display warning
32+
echo Warning: No .conda files found in %CONDA_BLD_PATH%\win-64
33+
echo This might be due to all the packages being skipped
34+
) else (
35+
:: Files found, run the upload command
36+
pixi run upload "%CONDA_BLD_PATH%\win-64\*.conda" --force
37+
if errorlevel 1 exit 1
38+
)

conda_build_config.yaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
numpy:
2-
- 1.26
2+
- 2
33
libprotobuf:
4-
- 5.29.3
4+
- 6.31.1
55
protobuf:
6-
- 5.29.3
6+
- 6.31.1
77
spdlog:
88
- 1.15
99
pugixml:
1010
- '1.15'
1111
libopencv:
12-
- 4.11.0
12+
- 4.12.0
1313
libxml2:
1414
- 2.13.*
1515
graphviz:
16-
- 12.*
16+
- 13.*
17+
vtk:
18+
- 9.4.2
19+
pcl:
20+
- 1.15.0
21+
ffmpeg:
22+
- 8
1723

1824
# Workaround for https://github.com/RoboStack/ros-kilted/pull/40#issuecomment-2782226697
1925
cmake:
20-
- 3.*
26+
- 3.*
2127

2228
cdt_name: # [linux]
2329
- conda # [linux]
@@ -51,8 +57,8 @@ cxx_compiler_version: # [unix]
5157
- 18 # [osx]
5258

5359
libzenohc:
54-
- 1.4.0
60+
- 1.5.1
5561
libzenohcxx:
56-
- 1.4.0
62+
- 1.5.1
5763
libcap:
58-
- 2.71
64+
- 2.75

patch/ros-kilted-apriltag-detector.win.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)