Skip to content

Commit b767594

Browse files
committed
Ref #85 defaultをnightlyにした
1 parent b74c650 commit b767594

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ jobs:
2020
name: Pull Submodule
2121
command: git submodule init && git submodule update --remote
2222
# install rustup and tools
23+
- run:
24+
name: rustup install nightly
25+
command: rustup install nightly && rustup default nightly
2326
- run:
2427
name: rustup version
2528
command: rustup --version
2629
- run:
2730
name: rustup component add
2831
command: rustup component add clippy rustfmt
29-
- run:
30-
name: rustup install nightly
31-
command: rustup install nightly
3232
- run:
3333
name: rustup target add
3434
command: rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
3535
- run:
3636
name: rustup target add nightly
37-
command: rustup run nightly rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
37+
command: rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
3838
- run:
3939
name: cargo install
4040
command: cargo install wasm-pack
@@ -73,7 +73,7 @@ jobs:
7373
# run bench
7474
- run:
7575
name: bench
76-
command: cd test && rustup run nightly cargo bench --features "bench"
76+
command: cd test && cargo bench --features "bench"
7777
when: always
7878
# build desktop
7979
- run:
@@ -87,7 +87,7 @@ jobs:
8787
# build embedded
8888
- run:
8989
name: build embedded release
90-
command: cd embedded && rustup run nightly cargo build --release && make
90+
command: cd embedded && cargo build --release && make
9191
when: always
9292
- store_artifacts:
9393
path: embedded/target/BUILD/rust-nes-emulator-for-DISCO-F769NI.bin

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM rust:1.37.0-buster
22

3+
RUN rustup install nightly
4+
RUN rustup default nightly
5+
36
RUN apt-get update \
47
&& apt-get install -y git libgtk-3-dev
58

@@ -9,7 +12,6 @@ RUN npm install -g n
912
RUN n 10.15.1
1013
RUN cargo install wasm-pack
1114
RUN rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
12-
RUN rustup install nightly
1315
RUN rustup run nightly rustup target add thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf
1416

1517
RUN mkdir /work

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ NES Emulator written in Rust
1919

2020
## Let's Play
2121

22-
rustc 1.37.0 required
22+
rustc 1.39.0-nightly required (for embedded optimization...)
2323

2424
### Desktop Application
2525

0 commit comments

Comments
 (0)