ci: upgrade cmake to Fedora:40 #14195
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #14195 +/- ##
==========================================
+ Coverage 93.24% 93.79% +0.55%
==========================================
Files 2206 2293 +87
Lines 192142 202912 +10770
==========================================
+ Hits 179156 190316 +11160
+ Misses 12986 12596 -390 ☔ View full report in Codecov by Sentry. |
|
Still getting on clang-tidy-tools I think this uses clang-tidy.sh, so not sure why it is not linking |
I think because some of the targets in google-cloud-cpp/generator/CMakeLists.txt Lines 172 to 175 in bd6390c That is not the only one. |
|
Locally Adding Still returns |
|
Hmm... I was able to build locally with: diff --git a/ci/cloudbuild/builds/clang-tidy.sh b/ci/cloudbuild/builds/clang-tidy.sh
index 98c3d3de5b..02c4893f6d 100755
--- a/ci/cloudbuild/builds/clang-tidy.sh
+++ b/ci/cloudbuild/builds/clang-tidy.sh
@@ -49,6 +49,7 @@ io::run cmake "${cmake_args[@]}" \
-DCMAKE_CXX_STANDARD=14 \
-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=ON \
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
+ -DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
-DGOOGLE_CLOUD_CPP_INTERNAL_DOCFX="${enable_docfx}"
io::run cmake --build cmake-out
diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile
index ec3bf88b8c..e56e7f2b10 100644
--- a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile
+++ b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM fedora:39
+FROM fedora:40
ARG NCPU=4
ARG ARCH=amd64
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 505df31022..e4abeb7990 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -172,6 +172,7 @@ create_bazel_config(google_cloud_cpp_generator YEAR "2020")
# Build protoc plugin executable
add_executable(protoc-gen-cpp_codegen plugin_main.cc)
+google_cloud_cpp_add_common_options(protoc-gen-cpp_codegen)
target_link_libraries(
protoc-gen-cpp_codegen LINK_PUBLIC google_cloud_cpp_generator
protobuf::libprotoc ${Protobuf_LIBRARIES})
@@ -190,11 +191,14 @@ else ()
endif ()
target_link_libraries(google_cloud_cpp_generator_config
PUBLIC protobuf::libprotobuf)
+google_cloud_cpp_add_common_options(google_cloud_cpp_generator_config
+ NO_WARNINGS)
set_target_properties(google_cloud_cpp_generator_config
PROPERTIES CXX_CLANG_TIDY "")
# Build standalone executable
add_executable(google-cloud-cpp-codegen standalone_main.cc)
+google_cloud_cpp_add_common_options(google-cloud-cpp-codegen)
target_link_libraries(
google-cloud-cpp-codegen
PUBLIC google_cloud_cpp_generator_config google_cloud_cpp_generator``` |
Maybe my docker cache needed to be cleared. Trying the patch on the CI. |
coryan
approved these changes
May 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#14076
This change is