Ref #85 defaultをnightlyにした

kamiyaowl · Sep 24, 2019 · b767594 · b767594
1 parent b74c650
commit b767594
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,21 +20,21 @@ jobs:
           name: Pull Submodule
           command: git submodule init && git submodule update --remote
       # install rustup and tools
+      - run:
+          name: rustup install nightly
+          command: rustup install nightly && rustup  default nightly
       - run:
           name: rustup version
           command: rustup --version
       - run:
           name: rustup component add
           command: rustup component add clippy rustfmt
-      - run:
-          name: rustup install nightly
-          command: rustup install nightly
       - run:
           name: rustup target add
           command: rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
       - run:
           name: rustup target add nightly
-          command: rustup run nightly rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
+          command: rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
       - run:
           name: cargo install
           command: cargo install wasm-pack
@@ -73,7 +73,7 @@ jobs:
       # run bench
       - run:
           name: bench
-          command: cd test && rustup run nightly cargo bench  --features "bench"
+          command: cd test && cargo bench  --features "bench"
           when: always
       # build desktop
       - run:
@@ -87,7 +87,7 @@ jobs:
       # build embedded
       - run:
           name: build embedded release
-          command: cd embedded && rustup run nightly cargo build --release && make
+          command: cd embedded && cargo build --release && make
           when: always
       - store_artifacts:
           path: embedded/target/BUILD/rust-nes-emulator-for-DISCO-F769NI.bin

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,8 @@
 FROM rust:1.37.0-buster
 
+RUN rustup install nightly
+RUN rustup default nightly
+
 RUN apt-get update \
   && apt-get install -y git libgtk-3-dev
 
@@ -9,7 +12,6 @@ RUN npm install -g n
 RUN n 10.15.1
 RUN cargo install wasm-pack
 RUN rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
-RUN rustup install nightly
 RUN rustup run nightly rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
 
 RUN mkdir /work

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ NES Emulator written in Rust
 
 ## Let's Play
 
-rustc 1.37.0 required
+rustc 1.39.0-nightly required (for embedded optimization...)
 
 ### Desktop Application