Skip to content

Commit

Permalink
Merge pull request #2962 from oasislabs/kostko/feature/bump-rust-2020…
Browse files Browse the repository at this point in the history
…-05-31

Bump Rust nightly to 2020-05-31
  • Loading branch information
kostko authored Jun 1, 2020
2 parents 2761bf8 + 2fedfbb commit 398852e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
Empty file added .changelog/2962.trivial.md
Empty file.
2 changes: 1 addition & 1 deletion .github/workflows/ci-reproducibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2020-05-15
toolchain: nightly-2020-05-31
override: true
- name: Install oasis-node build prerequisites
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2020-05-15
toolchain: nightly-2020-05-31
override: true
- name: Install oasis-node prerequisites
run: |
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ Prerequisites:
Then install the Fortanix Rust EDP utilities by running:
```
cargo +nightly install --version 0.3.1 fortanix-sgx-tools
cargo +nightly install --version 0.7.0 sgxs-tools
cargo +nightly install --version 0.4.0 fortanix-sgx-tools
cargo +nightly install --version 0.8.2 sgxs-tools
```
_NOTE: These utilities must be compiled with a nightly version of the Rust
Expand Down Expand Up @@ -170,8 +170,8 @@ Prerequisites:
active toolchain
----------------

nightly-2020-05-27-x86_64-unknown-linux-gnu (overridden by '/oasis-core/rust-toolchain')
rustc 1.45.0-nightly (5239f5c57 2020-05-26)
nightly-2020-05-31-x86_64-unknown-linux-gnu (overridden by '/oasis-core/rust-toolchain')
rustc 1.45.0-nightly (74e804683 2020-05-30)
```
Then add the Fortanix SGX Rust target to this version of the Rust toolchain by
Expand Down
6 changes: 3 additions & 3 deletions docker/development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG GO_PROTOC_VERSION=3.6.1
ARG GO_PROTOC_GEN_GO_VERSION=1.21.0
ARG GOLANGCILINT_VERSION=1.23.6
ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c
ARG RUST_NIGHTLY_VERSION=2020-05-15
ARG RUST_NIGHTLY_VERSION=2020-05-31

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -44,8 +44,8 @@ RUN curl "https://sh.rustup.rs" -sfo rustup.sh && \
sh rustup.sh -y --default-toolchain nightly-${RUST_NIGHTLY_VERSION} && \
rustup target add x86_64-fortanix-unknown-sgx && \
rustup component add rustfmt && \
cargo install --version 0.3.1 fortanix-sgx-tools && \
cargo install --version 0.7.0 sgxs-tools && \
cargo install --version 0.4.0 fortanix-sgx-tools && \
cargo install --version 0.8.2 sgxs-tools && \
cargo install cargo-audit

# Install Go and utilities.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2020-05-15
nightly-2020-05-31

0 comments on commit 398852e

Please sign in to comment.