Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest release of influxrs crate #55

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions components/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ env_logger = { version = "0.11", default-features = false, features = [
] }
fms-proto = { path = "fms-proto" }
influx-client = { path = "influx-client", default-features = false }
influxrs = { version = "2.0" }
influxrs = { version = "3.0", default-features = false }
log = { version = "0.4" }
protobuf = { version = "3.5.1" }
protobuf-codegen = { version = "3.5.1" }
Expand Down
2 changes: 1 addition & 1 deletion components/Dockerfile.fms-consumer
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ RUN apt-get update && apt-get install -y ca-certificates \
# This will speed up fetching the crate.io index in the future, see
# https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html
ENV CARGO_UNSTABLE_SPARSE_REGISTRY=true
RUN cargo install cargo-about

RUN echo "Building for $TARGETARCH"
RUN mkdir components
COPY . components/
WORKDIR /home/rust/src/components/fms-consumer

RUN cargo install cargo-about
RUN cargo about generate -o /home/rust/licenses.html ../about.hbs
RUN cargo build --release --target $BUILDTARGET
RUN mv ../target/${BUILDTARGET}/release/fms-consumer /home/rust
Expand Down
2 changes: 1 addition & 1 deletion components/Dockerfile.fms-forwarder
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ ENV CARGO_UNSTABLE_SPARSE_REGISTRY=true
# This is supposedly required for successfully building for arm64 using buildx with QEMU
# see https://github.com/rust-lang/cargo/issues/10583
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
RUN cargo install cargo-about

RUN echo "Building for $TARGETARCH"
RUN mkdir components
COPY . components/
WORKDIR /home/rust/src/components/fms-forwarder

RUN cargo install cargo-about
RUN cargo about generate -o /home/rust/licenses.html ../about.hbs
RUN cargo build --release --target $BUILDTARGET
RUN mv ../target/${BUILDTARGET}/release/fms-forwarder /home/rust
Expand Down
2 changes: 1 addition & 1 deletion components/Dockerfile.fms-server
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ ARG TARGETARCH
# This will speed up fetching the crate.io index in the future, see
# https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html
ENV CARGO_UNSTABLE_SPARSE_REGISTRY=true
RUN cargo install cargo-about

RUN echo "Building for $TARGETARCH"
RUN mkdir components
COPY . components/
WORKDIR /home/rust/src/components/fms-server

RUN cargo install cargo-about
RUN cargo about generate -o /home/rust/licenses.html ../about.hbs
RUN cargo build --release --target $BUILDTARGET
RUN mv ../target/${BUILDTARGET}/release/fms-server /home/rust
Expand Down
2 changes: 1 addition & 1 deletion components/fms-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ clap = { workspace = true, features = [
const_format = { version = "0.2" }
env_logger = { workspace = true }
influx-client = { workspace = true }
influxrs = { workspace = true }
influxrs = { workspace = true, features = ["client"] }
log = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion components/influx-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ clap = { workspace = true, features = [
] }
fms-proto = { workspace = true, optional = true }
protobuf = { workspace = true, optional = true }
influxrs = { workspace = true }
influxrs = { workspace = true, features = ["client"] }
isahc = { version = "1.7", default-features = false, features = [
"http2",
"static-ssl",
Expand Down