Skip to content

Commit

Permalink
Bump the minimum rust version to 1.78
Browse files Browse the repository at this point in the history
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
  • Loading branch information
bwoebi committed Jan 3, 2025
1 parent a397e47 commit e880898
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .circleci/continue_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ jobs:
command: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh
chmod +x /tmp/rustup.sh
/tmp/rustup.sh -y --default-toolchain 1.76
/tmp/rustup.sh -y --default-toolchain 1.78
sudo ln -s $HOME/.cargo/bin/* /usr/bin/
- run: git config --global --add safe.directory /home/circleci/datadog/appsec/third_party/libddwaf
- run:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["components-rs", "components-rs/php_sidecar_mockgen", "profiling"]
resolver = "2"

[workspace.package]
rust-version = "1.69"
rust-version = "1.78.0"
edition = "2021"
# Irrelevant version and license. These do NOT apply here, they just are here to make cargo build pass.
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Visit the [PHP tracer documentation](https://docs.datadoghq.com/tracing/language

#### Installation from PECL (datadog_trace) or from source

Compilation of the tracer and the profiler requires cargo to be installed. Ensure that cargo is minimum version 1.76.0, otherwise follow the [official instructions for installing cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html).
Compilation of the tracer and the profiler requires cargo to be installed. Ensure that cargo is minimum version 1.78.0, otherwise follow the [official instructions for installing cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html).

### Advanced configuration

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ci/alpine_compile_extension/base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

RUN mkdir -p /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/ci/bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ RUN set -eux; \
mkdir -p $PHP_INSTALL_DIR; \
chown -R circleci:circleci /opt;

ARG RUST_VERSION="1.76.0"
ARG RUST_NIGHTLY_VERSION="-2024-11-04"
ARG RUST_VERSION="1.78.0"
ARG RUST_NIGHTLY_VERSION="-2025-01-03"
# Mount a cache into /rust/cargo if you want to pre-fetch packages or something
ENV CARGO_HOME=/rust/cargo
ENV RUSTUP_HOME=/rust/rustup
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/ci/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ RUN set -eux; \
chown -R circleci:circleci /opt;

# rust sha256sum generated locally after verifying it with sha256
ARG RUST_VERSION="1.76.0"
ARG RUST_SHA256_ARM="2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0"
ARG RUST_SHA256_X86="9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399"
ARG RUST_VERSION="1.78.0"
ARG RUST_SHA256_ARM="131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af"
ARG RUST_SHA256_X86="1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87"
# Mount a cache into /rust/cargo if you want to pre-fetch packages or something
ENV CARGO_HOME=/rust/cargo
ENV RUSTUP_HOME=/rust/rustup
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/ci/centos/7/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ RUN source scl_source enable devtoolset-7 \
&& rm -fr "$FILENAME" "${FILENAME%.tar.gz}" "protobuf-${PROTOBUF_VERSION}"

# rust sha256sum generated locally after verifying it with sha256
ARG RUST_VERSION="1.76.0"
ARG RUST_SHA256_ARM="2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0"
ARG RUST_SHA256_X86="9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399"
ARG RUST_VERSION="1.78.0"
ARG RUST_SHA256_ARM="131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af"
ARG RUST_SHA256_X86="1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87"
# Mount a cache into /rust/cargo if you want to pre-fetch packages or something
ENV CARGO_HOME=/rust/cargo
ENV RUSTUP_HOME=/rust/rustup
Expand Down
2 changes: 1 addition & 1 deletion profiling/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "datadog-php-profiling"
version = "0.0.0"
edition = "2021"
license = "Apache-2.0"
rust-version = "1.76"
rust-version = "1.78"

[lib]
crate-type = ["cdylib"]
Expand Down

0 comments on commit e880898

Please sign in to comment.