From 29a5ee982a268a6b86be12d9862fc0facc7e0347 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Wed, 9 Aug 2023 13:17:53 -0700 Subject: [PATCH 1/4] chore(dev): Fix package install in Tiltfile Missed during the upgrade to Debian Bookworm Signed-off-by: Jesse Szwedko --- tilt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tilt/Dockerfile b/tilt/Dockerfile index 1a7504769ad57..9be7d77c6b540 100644 --- a/tilt/Dockerfile +++ b/tilt/Dockerfile @@ -7,7 +7,7 @@ ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_me # VECTOR BUILDER # FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE} as builder -RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-10-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g +RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-11-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v1.2.1 && make -j"$(nproc)" && make install WORKDIR /vector From 0aac5f87214118fcb1f25f571ef27fcae4cc2886 Mon Sep 17 00:00:00 2001 From: Jesse Date: Thu, 10 Aug 2023 20:39:49 +0000 Subject: [PATCH 2/4] Update mold Signed-off-by: Jesse --- tilt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tilt/Dockerfile b/tilt/Dockerfile index 9be7d77c6b540..ea1fd09a4887e 100644 --- a/tilt/Dockerfile +++ b/tilt/Dockerfile @@ -8,7 +8,7 @@ ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_me # FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE} as builder RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-11-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g -RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v1.2.1 && make -j"$(nproc)" && make install +RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v2.0.0 && make -j"$(nproc)" && make install WORKDIR /vector COPY . . From bbe852522e0fc0bf4d87066e7368d878f500b2a6 Mon Sep 17 00:00:00 2001 From: Jesse Date: Thu, 10 Aug 2023 21:18:13 +0000 Subject: [PATCH 3/4] Actually update mold Signed-off-by: Jesse --- tilt/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tilt/Dockerfile b/tilt/Dockerfile index ea1fd09a4887e..dcdcaca0abe7c 100644 --- a/tilt/Dockerfile +++ b/tilt/Dockerfile @@ -8,11 +8,19 @@ ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_me # FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE} as builder RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-11-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g -RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v2.0.0 && make -j"$(nproc)" && make install +RUN git clone https://github.com/rui314/mold.git \ + && mkdir mold/build \ + && cd mold/build \ + && git checkout v2.0.0 \ + && ../install-build-deps.sh \ + && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=c++ .. \ + && cmake --build . -j $(nproc) \ + && cmake --install . WORKDIR /vector COPY . . ARG FEATURES +RUN scripts/environment/install-protoc.sh RUN --mount=type=cache,target=/vector/target \ --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/usr/local/cargo/git \ From bc2d1ddc8b72438d4cc3083d4d524f23998d9cf1 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Thu, 10 Aug 2023 14:28:32 -0700 Subject: [PATCH 4/4] Spelling Signed-off-by: Jesse Szwedko --- .github/actions/spelling/excludes.txt | 4 +++- .github/actions/spelling/expect.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index d18d1c721531f..620bf03ad6410 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -69,11 +69,13 @@ \.zst$ ^\.github/actions/spelling/ ^\Q.cargo/config.toml\E$ -^\Q.github/workflows/spelling.yml\E$ ^\Q.github/workflows/gardener_issue_comment.yml\E$ +^\Q.github/workflows/spelling.yml\E$ ^\Qbenches/codecs/moby_dick.txt\E$ ^\Qbenches/dnstap/mod.rs\E$ ^\Qbenches/transform/route.rs\E$ +^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf.desc\E$ +^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc\E$ ^\Qlib/dnsmsg-parser/benches/benches.rs\E$ ^\Qlib/dnsmsg-parser/src/dns_message_parser.rs\E$ ^\Qlib/lookup/tests/fixtures/lookup/quoted\E$ diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index ac8866391945e..55cd47a320233 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -231,6 +231,7 @@ datname dbkind dbreader DBserver +DCMAKE ddagent ddev ddmetric