diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 362eb90bed895..9f4b7c9f9fdf7 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -117,9 +117,6 @@ ^\Qwebsite/cue/reference/remap/functions/ip_pton.cue\E$ ^\Qwebsite/layouts/shortcodes/config/unit-tests.html\E$ ^lib/codecs/tests/data/native_encoding/ -<<<<<<< HEAD ^\Qwebsite/config.toml\E$ -======= ^proto/google/ ->>>>>>> b0fb6a4fb (Fix spelling test) ignore$ diff --git a/build.rs b/build.rs index 05d186612a4c9..d4e1d06fd9086 100644 --- a/build.rs +++ b/build.rs @@ -155,6 +155,11 @@ fn main() { "proto/third-party/google/rpc/status.proto", "proto/vector/vector.proto", ], + &[ + "proto/third-party", + "proto/vector", + "lib/vector-core/proto/", + ], ) .unwrap(); }