Skip to content

Commit

Permalink
Push rust-toolchain to 05-22 to fix Rust issue 60050
Browse files Browse the repository at this point in the history
  • Loading branch information
dingelish committed Jun 12, 2019
1 parent f17a792 commit e0fa56e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Current wiki pages:

## v1.0.8 Release

Supports the most recent Rust nightly (nightly-2019-05-20) and Rust stable (stable-2019-05-14). Bug fixes in memory allocator and panicking routines. New third party libraries to support kvdb-memorydb. Please refer to [release_notes](release_notes.md) for more details.
Supports the most recent Rust nightly (nightly-2019-05-22) and Rust stable (stable-2019-05-14). Bug fixes in memory allocator and panicking routines. New third party libraries to support kvdb-memorydb. Please refer to [release_notes](release_notes.md) for more details.

## v1.0.7 Release

Expand Down
2 changes: 1 addition & 1 deletion dockerfile/Dockerfile.1604.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ MAINTAINER Yu Ding
ENV sdk_bin https://download.01.org/intel-sgx/linux-2.5/ubuntu16.04-server/sgx_linux_x64_sdk_2.5.100.49891.bin
ENV psw_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu16.04-server/libsgx-enclave-common_2.5.101.50123-xenial1_amd64.deb
ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu16.04-server/libsgx-enclave-common-dev_2.5.101.50123-xenial1_amd64.deb
ENV rust_toolchain nightly-2019-05-20
ENV rust_toolchain nightly-2019-05-22

RUN apt-get update && \
apt-get install -y build-essential ocaml automake autoconf libtool wget python libssl-dev libcurl4-openssl-dev protobuf-compiler libprotobuf-dev sudo kmod vim curl git-core libprotobuf-c0-dev libboost-thread-dev libboost-system-dev liblog4cpp5-dev libjsoncpp-dev alien uuid-dev libxml2-dev cmake pkg-config expect gdb && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfile/Dockerfile.1804.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ENV sdk_bin https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/sgx_l
ENV psw_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/libsgx-enclave-common_2.5.101.50123-bionic1_amd64.deb
ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/libsgx-enclave-common-dev_2.5.101.50123-bionic1_amd64.deb
ENV psw_dbgsym_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/libsgx-enclave-common-dbgsym_2.5.101.50123-bionic1_amd64.ddeb
ENV rust_toolchain nightly-2019-05-20
ENV rust_toolchain nightly-2019-05-22
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion release_notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rust SGX SDK v1.0.8 Release Notes

**Supports Rust nightly-2019-05-20** in master branch (rustc 1.36.0)
**Supports Rust nightly-2019-05-22** in master branch (rustc 1.36.0)

**Supports Rust stable-2019-05-14** in stable branch (rustc 1.34.2)

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2019-05-20
nightly-2019-05-22

0 comments on commit e0fa56e

Please sign in to comment.