diff --git a/.ci/micromamba/ci.yaml b/.ci/micromamba/ci.yaml index 72569049..5a9040d9 100644 --- a/.ci/micromamba/ci.yaml +++ b/.ci/micromamba/ci.yaml @@ -17,6 +17,5 @@ dependencies: - gcc - gxx - git - - patch - pip: - codechecker==6.27.3 diff --git a/.ci/micromamba/dev.yaml b/.ci/micromamba/dev.yaml index 390873ae..9ab17226 100644 --- a/.ci/micromamba/dev.yaml +++ b/.ci/micromamba/dev.yaml @@ -13,6 +13,5 @@ dependencies: - gcc - gxx - git - - patch - pip: - codechecker==6.27.3 diff --git a/test/foss/yaml-cpp/init.sh b/test/foss/yaml-cpp/init.sh index 00e5061b..34fa2169 100755 --- a/test/foss/yaml-cpp/init.sh +++ b/test/foss/yaml-cpp/init.sh @@ -32,17 +32,12 @@ if [ "$MAJOR_VERSION" -ge 8 ]; then fi git clone https://github.com/jbeder/yaml-cpp.git "$1" -git -C "$1" checkout yaml-cpp-0.7.0 +git -C "$1" checkout yaml-cpp-0.8.0 # This file must be in the root of the project to be analyzed for bazelisk to work bazelversion="../../../.bazelversion" [ -f $bazelversion ] && cp $bazelversion "$1" -# Using very new c compilers (e.g. clang 21) cause the build to fail -# also causing analysis to do so. -# This patch applies a compile flag to ignore the warning causing this fail. -patch $1/BUILD.bazel -p1 < yaml-cpp-070.patch - # Add codechecker to the project cat <> "$1/BUILD.bazel" #------------------------------------------------------- diff --git a/test/foss/yaml-cpp/yaml-cpp-070.patch b/test/foss/yaml-cpp/yaml-cpp-070.patch deleted file mode 100644 index 9789a025..00000000 --- a/test/foss/yaml-cpp/yaml-cpp-070.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/BUILD.bazel -+++ b/BUILD.bazel -@@ -10,5 +10,7 @@ - visibility = ["//visibility:public"], - includes = ["include"], - hdrs = glob(["include/**/*.h"]), -+ # Newer compilers throw warnings without this. -+ copts = ["-include cstdint"], - srcs = glob(["src/**/*.cpp", "src/**/*.h"]), - )