Skip to content

Commit 18b8bc5

Browse files
leoparenteclaude
leoparente
and
claude
committed
fix: address PR review comments and fix remaining CI failures
- Fix build_cross.yml: conan export path was wrong (src/conan/ → conan/) - Fix unit-tests-mac: add tools.apple:sdk_path to conan profile so CMakeToolchain uses the full SDK path instead of bare 'macosx', resolving 'initializer_list' not found compile error - Add missing conan export step to build-win64, build-app-image-x64 jobs - Fix entrypoint.sh: copy conan/ directory and run conan export before cmake, fixing Docker-based arm64/debug builds - Expand all conan cache keys to include conan/corrade/** so changes to conandata.yml or cmake helpers invalidate cache correctly - Set required_conan_version = ">=2.0" in local Conan recipe (recipe uses Conan 2 imports; >=1.52.0 would silently accept Conan 1) - Fix find_program in conan-corrade-vars.cmake: PATHS ENV PATH syntax (was split across lines causing ambiguity) and add NOTFOUND guard Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent dd2d994 commit 18b8bc5

7 files changed

Lines changed: 34 additions & 18 deletions

File tree

‎.github/actions/build-cpp/entrypoint.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ function build() {
2020
cp -rf /github/workspace/CMakeLists.txt /pktvisor-src/
2121
cp -rf /github/workspace/conanfile.py /pktvisor-src/
2222
cp -rf /github/workspace/.conanrc /pktvisor-src/
23+
cp -rf /github/workspace/conan/ /pktvisor-src/conan/
2324
cd /pktvisor-src/
2425
conan profile detect -f
26+
conan export /pktvisor-src/conan/corrade/ --name=corrade --version=cci.20260327
2527
cd /pktvisor-src/build/
2628
if [ "$INPUT_ARCH" == "amd64" ]; then
2729
PKG_CONFIG_PATH=/local/lib/pkgconfig cmake .. -DCMAKE_BUILD_TYPE=$INPUT_BUILD_TYPE \

‎.github/workflows/build-develop.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@ jobs:
4343
uses: actions/cache@v5
4444
with:
4545
path: ${{github.workspace}}/build/p/
46-
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/conanfile.py') }}
46+
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
4747
restore-keys: conan-${{ runner.os }}-
4848

4949
- name: Detect Conan Profile
50-
run: conan profile detect -f
50+
run: |
51+
conan profile detect -f
52+
echo "[conf]" >> "$(conan profile path default)"
53+
echo "tools.apple:sdk_path=$(xcrun --sdk macosx --show-sdk-path)" >> "$(conan profile path default)"
5154
5255
- name: Export local Corrade recipe
5356
run: conan export ${{github.workspace}}/conan/corrade/ --name=corrade --version=cci.20260327
@@ -86,7 +89,7 @@ jobs:
8689
uses: actions/cache@v5
8790
with:
8891
path: ${{github.workspace}}/build/p/
89-
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/conanfile.py') }}
92+
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
9093
restore-keys: conan-${{ runner.os }}-amd64-
9194

9295
- name: Export local Corrade recipe
@@ -137,7 +140,7 @@ jobs:
137140
uses: actions/cache@v5
138141
with:
139142
path: ${{github.workspace}}/build/p/
140-
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/conanfile.py') }}
143+
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
141144
restore-keys: conan-${{ runner.os }}-
142145

143146
- name: Export local Corrade recipe
@@ -248,7 +251,7 @@ jobs:
248251
uses: actions/cache@v5
249252
with:
250253
path: ${{github.workspace}}/build/p/
251-
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
254+
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
252255
restore-keys: conan-${{ runner.os }}-amd64-
253256

254257
- name: Build pktvisord + push symbol to backtrace.io
@@ -347,9 +350,12 @@ jobs:
347350
uses: actions/cache@v5
348351
with:
349352
path: ${{github.workspace}}/build/p/
350-
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
353+
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
351354
restore-keys: conan-${{ runner.os }}-amd64-
352355

356+
- name: Export local Corrade recipe
357+
run: conan export ${{github.workspace}}/conan/corrade/ --name=corrade --version=cci.20260327
358+
353359
- name: Configure CMake to generate VERSION
354360
shell: bash
355361
working-directory: ${{github.workspace}}/build
@@ -435,7 +441,7 @@ jobs:
435441
uses: actions/cache@v5
436442
with:
437443
path: ${{github.workspace}}/build/p/
438-
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
444+
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
439445
restore-keys: conan-${{ runner.os }}-arm64-
440446

441447
- name: Build pktvisord + push symbol to backtrace.io

‎.github/workflows/build-release.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/cache@v5
3737
with:
3838
path: ${{github.workspace}}/build/p/
39-
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/conanfile.py') }}
39+
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
4040
restore-keys: conan-${{ runner.os }}-
4141

4242
- name: Export local Corrade recipe
@@ -181,9 +181,13 @@ jobs:
181181
uses: actions/cache@v5
182182
with:
183183
path: ${{github.workspace}}/build/p/
184-
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
184+
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
185185
restore-keys: conan-${{ runner.os }}-
186186

187+
- name: Export local Corrade recipe
188+
shell: bash
189+
run: conan export $GITHUB_WORKSPACE/conan/corrade/ --name=corrade --version=cci.20260327
190+
187191
- name: Configure CMake
188192
shell: bash
189193
working-directory: ${{github.workspace}}\build
@@ -291,7 +295,7 @@ jobs:
291295
uses: actions/cache@v5
292296
with:
293297
path: ${{github.workspace}}/build/p/
294-
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
298+
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
295299
restore-keys: conan-${{ runner.os }}-arm64-
296300

297301
- name: Build pktvisord + push symbol to backtrace.io
@@ -410,7 +414,7 @@ jobs:
410414
uses: actions/cache@v5
411415
with:
412416
path: ${{github.workspace}}/build/p/
413-
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
417+
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
414418
restore-keys: conan-${{ runner.os }}-
415419

416420
- name: Build pktvisord + push symbol to backtrace.io

‎.github/workflows/build_cross.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ jobs:
119119
uses: actions/cache@v5
120120
with:
121121
path: ${{github.workspace}}/src/build/p/
122-
key: conan-${{ runner.os }}-${{matrix.arch}}-${{ hashFiles('**/conanfile.py') }}
122+
key: conan-${{ runner.os }}-${{matrix.arch}}-${{ hashFiles('**/conanfile.py', 'conan/corrade/**') }}
123123
restore-keys: conan-${{ runner.os }}-${{matrix.arch}}-
124124

125125
- name: Export local Corrade recipe
126-
run: conan export ${{github.workspace}}/src/conan/corrade/ --name=corrade --version=cci.20260327
126+
run: conan export ${{github.workspace}}/conan/corrade/ --name=corrade --version=cci.20260327
127127

128128
- name: Install dependencies
129129
working-directory: ${{github.workspace}}/src

‎.github/workflows/build_debug.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/cache@v5
2929
with:
3030
path: ${{github.workspace}}/build/p/
31-
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/conanfile.py') }}
31+
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
3232
restore-keys: conan-${{ runner.os }}-amd64-
3333

3434
- name: linux package install
@@ -82,7 +82,7 @@ jobs:
8282
uses: actions/cache@v5
8383
with:
8484
path: ${{github.workspace}}/build/p/
85-
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
85+
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py', 'conan/corrade/**') }}
8686
restore-keys: conan-${{ runner.os }}-amd64-
8787

8888
- name: Build pktvisord + push symbol to backtrace.io

‎conan/corrade/cmake/conan-corrade-vars.cmake‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,19 @@ if(NOT TARGET Corrade::rc)
4040
if(CMAKE_CROSSCOMPILING)
4141
find_program(CORRADE_RC_PROGRAM
4242
NAMES corrade-rc
43-
PATHS ENV
44-
PATH NO_DEFAULT_PATH)
43+
PATHS ENV PATH
44+
NO_DEFAULT_PATH)
4545
else()
4646
find_program(CORRADE_RC_PROGRAM
4747
NAMES corrade-rc
4848
PATHS "${CMAKE_CURRENT_LIST_DIR}/../../bin/"
4949
NO_DEFAULT_PATH)
5050
endif()
5151

52+
if(CORRADE_RC_PROGRAM STREQUAL "CORRADE_RC_PROGRAM-NOTFOUND")
53+
message(FATAL_ERROR "Corrade: corrade-rc not found. Pass -DCORRADE_RC_PROGRAM=/path/to/corrade-rc.")
54+
endif()
55+
5256
get_filename_component(CORRADE_RC_PROGRAM "${CORRADE_RC_PROGRAM}" ABSOLUTE)
5357

5458
add_executable(Corrade::rc IMPORTED)

‎conan/corrade/conanfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
88
from conan.tools.microsoft import is_msvc, check_min_vs
99

10-
required_conan_version = ">=1.52.0"
10+
required_conan_version = ">=2.0"
1111

1212

1313
class CorradeConan(ConanFile):

0 commit comments

Comments
 (0)