Skip to content

Commit 63f1f55

Browse files
committed
Test which images need the cmake to force the protobuf language version.
This is to work around the failure from the continuous run we got this weekend. The original failure is report upstream in protocolbuffers/protobuf#21005
1 parent dd2b330 commit 63f1f55

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/build.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ jobs:
2727
swift:
2828
- version: 6.0.3-noble
2929
hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
30+
cmake_extra: "-DCMAKE_CXX_STANDARD=17"
3031
- version: 5.10.1-noble
3132
# No "hook", see https://github.com/apple/swift-protobuf/issues/1560 for the
3233
# current issue with using -warnings-as-errors on linux.
34+
cmake_extra: "-DCMAKE_CXX_STANDARD=17"
3335
- version: 5.9.2-focal
3436
hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
37+
cmake_extra: "-DCMAKE_CXX_STANDARD=17"
3538
- version: 5.8.1-focal
3639
hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
40+
cmake_extra: "-DCMAKE_CXX_STANDARD=17"
3741
# protobuf_git can reference a commit, tag, or branch
3842
# commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
3943
# tag: "ref/tags/v3.11.4"
@@ -92,7 +96,7 @@ jobs:
9296
mkdir cmake_build
9397
cd cmake_build
9498
cmake \
95-
-DCMAKE_CXX_STANDARD=17 \
99+
${{ matrix.swift.cmake_extra }} \
96100
-DCMAKE_BUILD_TYPE=Release \
97101
-Dprotobuf_BUILD_TESTS=OFF \
98102
-Dprotobuf_INSTALL=OFF \

0 commit comments

Comments
 (0)