Skip to content

Commit f39a0e9

Browse files
authored
chore(dev): Fix package install in Tiltfile (vectordotdev#18198)
* chore(dev): Fix package install in Tiltfile Missed during the upgrade to Debian Bookworm Signed-off-by: Jesse Szwedko <[email protected]> * Update mold Signed-off-by: Jesse <[email protected]> * Actually update mold Signed-off-by: Jesse <[email protected]> * Spelling Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]> Signed-off-by: Jesse <[email protected]>
1 parent 1dd7bb1 commit f39a0e9

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/actions/spelling/excludes.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,13 @@
6969
\.zst$
7070
^\.github/actions/spelling/
7171
^\Q.cargo/config.toml\E$
72-
^\Q.github/workflows/spelling.yml\E$
7372
^\Q.github/workflows/gardener_issue_comment.yml\E$
73+
^\Q.github/workflows/spelling.yml\E$
7474
^\Qbenches/codecs/moby_dick.txt\E$
7575
^\Qbenches/dnstap/mod.rs\E$
7676
^\Qbenches/transform/route.rs\E$
77+
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf.desc\E$
78+
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc\E$
7779
^\Qlib/dnsmsg-parser/benches/benches.rs\E$
7880
^\Qlib/dnsmsg-parser/src/dns_message_parser.rs\E$
7981
^\Qlib/lookup/tests/fixtures/lookup/quoted\E$

.github/actions/spelling/expect.txt

+1
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ datname
231231
dbkind
232232
dbreader
233233
DBserver
234+
DCMAKE
234235
ddagent
235236
ddev
236237
ddmetric

tilt/Dockerfile

+10-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@ ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_me
77
# VECTOR BUILDER
88
#
99
FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE} as builder
10-
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
11-
RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v1.2.1 && make -j"$(nproc)" && make install
10+
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
11+
RUN git clone https://github.com/rui314/mold.git \
12+
&& mkdir mold/build \
13+
&& cd mold/build \
14+
&& git checkout v2.0.0 \
15+
&& ../install-build-deps.sh \
16+
&& cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=c++ .. \
17+
&& cmake --build . -j $(nproc) \
18+
&& cmake --install .
1219

1320
WORKDIR /vector
1421
COPY . .
1522
ARG FEATURES
23+
RUN scripts/environment/install-protoc.sh
1624
RUN --mount=type=cache,target=/vector/target \
1725
--mount=type=cache,target=/usr/local/cargo/registry \
1826
--mount=type=cache,target=/usr/local/cargo/git \

0 commit comments

Comments
 (0)