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

Bump Rust toolchain to 2021-05-20 #3955

Merged
merged 3 commits into from
May 21, 2021
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
1 change: 0 additions & 1 deletion .buildkite/benchmarks.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ docker_plugin_default_config: &docker_plugin_default_config
- "LANG=C.UTF-8"
- "CARGO_TARGET_DIR=/var/tmp/artifacts"
- "CARGO_INSTALL_ROOT=/root/.cargo"
- "CARGO_INCREMENTAL=0"
- "GOPROXY=https://proxy.golang.org/"
- "BUILDKITE_PIPELINE_NAME"
- "BUILDKITE_BUILD_NUMBER"
Expand Down
4 changes: 1 addition & 3 deletions .buildkite/code.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ docker_plugin_default_config: &docker_plugin_default_config
- "LANG=C.UTF-8"
- "CARGO_TARGET_DIR=/var/tmp/artifacts"
- "CARGO_INSTALL_ROOT=/root/.cargo"
- "CARGO_INCREMENTAL=0"
- "GOPROXY=https://proxy.golang.org/"
propagate-environment: true
unconfined: true
Expand All @@ -53,7 +52,6 @@ docker_plugin_sgx_config: &docker_plugin_sgx_config
- "LANG=C.UTF-8"
- "CARGO_TARGET_DIR=/var/tmp/artifacts"
- "CARGO_INSTALL_ROOT=/root/.cargo"
- "CARGO_INCREMENTAL=0"
- "GOPROXY=https://proxy.golang.org/"

docker_plugin: &docker_plugin
Expand Down Expand Up @@ -257,7 +255,7 @@ steps:
# E2E test - intel-sgx with IAS
###############################
- label: E2E tests - intel-sgx - IAS
timeout_in_minutes: 10
timeout_in_minutes: 15
command:
- .buildkite/scripts/sgx_ias_tests.sh
# A unique string to identify the step. The value is available in the
Expand Down
1 change: 0 additions & 1 deletion .buildkite/longtests.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ docker_plugin_default_config: &docker_plugin_default_config
- "LANG=C.UTF-8"
- "CARGO_TARGET_DIR=/var/tmp/artifacts"
- "CARGO_INSTALL_ROOT=/root/.cargo"
- "CARGO_INCREMENTAL=0"
- "GOPROXY=https://proxy.golang.org/"
- "SLACK_WEBHOOK_URL"
- "METRICS_PUSH_ADDR"
Expand Down
1 change: 0 additions & 1 deletion .changelog/3815.internal.md

This file was deleted.

Empty file removed .changelog/3954.trivial.md
Empty file.
1 change: 1 addition & 0 deletions .changelog/3955.internal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump Rust toolchain to 2021-05-20
2 changes: 1 addition & 1 deletion docker/development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG GO_PROTOC_GEN_GO_VERSION=1.21.0
ARG GOLANGCILINT_VERSION=1.28.2
ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c
ARG GOFUMPT_VERSION=abc0db2c416aca0f60ea33c23c76665f6e7ba0b6
ARG RUST_NIGHTLY_VERSION=2021-05-07
ARG RUST_NIGHTLY_VERSION=2021-05-20

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
4 changes: 2 additions & 2 deletions docs/setup/prerequisites.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ Core:
active toolchain
----------------

nightly-2021-05-07-x86_64-unknown-linux-gnu (overridden by '/code/rust-toolchain')
rustc 1.54.0-nightly (676ee1472 2021-05-06)
nightly-2021-05-20-x86_64-unknown-linux-gnu (overridden by '/code/rust-toolchain')
rustc 1.54.0-nightly (f94942d84 2021-05-19)
```

Then add the Fortanix SGX Rust target to this version of the Rust toolchain by
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2021-05-07
nightly-2021-05-20