Skip to content

Commit 688d594

Browse files
authored
Merge pull request #52 from qryxip/ja-all-enabled-final-crate-update
Final crate update: - Update Cargo.toml to remove the crates rejected by AtCoder. - Update Cargo.toml with the latest versions of accepted crates. - Change the Rust version for the CI from 1.39.0 to 1.40.0. - Remove dep-tests. Run test-examples on all the tool chains on the CI.
2 parents 5ba7d01 + 79f9b1b commit 688d594

22 files changed

+78
-1428
lines changed

.cargo/config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[alias]
2-
dep-tests = ["run", "--manifest-path", "./tools/dep-tests/Cargo.toml", "--"]
32
test-examples = ["run", "--manifest-path", "./tools/test-examples/Cargo.toml", "--"]

.github/workflows/ci.yml

Lines changed: 30 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ jobs:
1414
# Breaking changes like this might be mixed into the future stable versions.
1515
# https://github.com/rust-lang/rustfmt/pull/3632
1616
channel:
17-
- 1.39.0
17+
- 1.40.0
1818
- stable
1919

2020
name: Rustfmt (${{ matrix.channel }})
2121
runs-on: ubuntu-18.04
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v1
25+
uses: actions/checkout@v2
2626

27-
- name: rust-toolchain
27+
- name: Setup ${{ matrix.channel }}-x86_64-unknown-linux-gnu
2828
uses: actions-rs/toolchain@v1
2929
with:
3030
toolchain: ${{ matrix.channel }}-x86_64-unknown-linux-gnu
@@ -37,71 +37,22 @@ jobs:
3737
command: fmt
3838
args: -- --check
3939

40-
- name: '`cargo fmt --manifest-path ./tools/dep-tests/Cargo.toml -- --check`'
41-
uses: actions-rs/cargo@v1
42-
with:
43-
command: fmt
44-
args: --manifest-path ./tools/dep-tests/Cargo.toml -- --check
45-
4640
- name: '`cargo fmt --manifest-path ./tools/test-examples/Cargo.toml -- --check`'
4741
uses: actions-rs/cargo@v1
4842
with:
4943
command: fmt
5044
args: --manifest-path ./tools/test-examples/Cargo.toml -- --check
5145

52-
test-examples:
53-
name: test-examples
54-
runs-on: ubuntu-18.04
55-
56-
steps:
57-
- name: Checkout
58-
uses: actions/checkout@v1
59-
60-
- name: setup-python
61-
uses: actions/setup-python@v1
62-
with:
63-
python-version: '3.8'
64-
65-
- name: rust-toolchain
66-
uses: actions-rs/toolchain@v1
67-
with:
68-
toolchain: 1.39.0-x86_64-unknown-linux-gnu
69-
default: true
70-
profile: default
71-
72-
- name: '`cargo install --git https://github.com/rust-lang-ja/atcoder-rustc-dep-option-generator`'
73-
uses: actions-rs/cargo@v1
74-
with:
75-
command: install
76-
args: --git https://github.com/rust-lang-ja/atcoder-rustc-dep-option-generator
77-
78-
- name: '`cargo clippy --all-features --manifest-path ./tools/test-examples/Cargo.toml -- -D warnings`'
79-
uses: actions-rs/cargo@v1
80-
with:
81-
command: clippy
82-
args: --all-features --manifest-path ./tools/test-examples/Cargo.toml -- -D warnings
83-
84-
- name: '`cargo build --all-features --release`'
85-
uses: actions-rs/cargo@v1
86-
with:
87-
command: build
88-
args: --all-features --release
89-
90-
- name: '`cargo test-examples`'
91-
uses: actions-rs/cargo@v1
92-
with:
93-
command: test-examples
94-
9546
build:
9647
strategy:
9748
fail-fast: false
9849
matrix:
9950
toolchain:
10051
# `x86_64-pc-windows-gnu` is tier 1 **for now**.
101-
- 1.39.0-x86_64-pc-windows-msvc
102-
- 1.39.0-x86_64-pc-windows-gnu
103-
- 1.39.0-x86_64-apple-darwin
104-
- 1.39.0-x86_64-unknown-linux-gnu
52+
- 1.40.0-x86_64-pc-windows-msvc
53+
- 1.40.0-x86_64-pc-windows-gnu
54+
- 1.40.0-x86_64-apple-darwin
55+
- 1.40.0-x86_64-unknown-linux-gnu
10556
- stable-x86_64-pc-windows-msvc
10657
- stable-x86_64-pc-windows-gnu
10758
- stable-x86_64-apple-darwin
@@ -111,53 +62,29 @@ jobs:
11162
- beta-x86_64-apple-darwin
11263
- beta-x86_64-unknown-linux-gnu
11364
include:
114-
- toolchain: 1.39.0-x86_64-pc-windows-msvc
115-
features: --no-default-features
116-
dep_tests: true
65+
- toolchain: 1.40.0-x86_64-pc-windows-msvc
11766
os: windows-latest
118-
- toolchain: 1.39.0-x86_64-pc-windows-gnu
119-
features: --no-default-features
120-
dep_tests: false
67+
- toolchain: 1.40.0-x86_64-pc-windows-gnu
12168
os: windows-latest
122-
- toolchain: 1.39.0-x86_64-apple-darwin
123-
features: --all-features
124-
dep_tests: true
69+
- toolchain: 1.40.0-x86_64-apple-darwin
12570
os: macOS-latest
126-
- toolchain: 1.39.0-x86_64-unknown-linux-gnu
127-
features: --all-features
128-
dep_tests: true
71+
- toolchain: 1.40.0-x86_64-unknown-linux-gnu
12972
os: ubuntu-18.04
13073
- toolchain: stable-x86_64-pc-windows-msvc
131-
features: --no-default-features
132-
dep_tests: true
13374
os: windows-latest
13475
- toolchain: stable-x86_64-pc-windows-gnu
135-
features: --no-default-features
136-
dep_tests: false
13776
os: windows-latest
13877
- toolchain: stable-x86_64-apple-darwin
139-
features: --all-features
140-
dep_tests: true
14178
os: macOS-latest
14279
- toolchain: stable-x86_64-unknown-linux-gnu
143-
features: --all-features
144-
dep_tests: true
14580
os: ubuntu-18.04
14681
- toolchain: beta-x86_64-pc-windows-msvc
147-
features: --no-default-features
148-
dep_tests: true
14982
os: windows-latest
15083
- toolchain: beta-x86_64-pc-windows-gnu
151-
features: --no-default-features
152-
dep_tests: false
15384
os: windows-latest
15485
- toolchain: beta-x86_64-apple-darwin
155-
features: --all-features
156-
dep_tests: true
15786
os: macOS-latest
15887
- toolchain: beta-x86_64-unknown-linux-gnu
159-
features: --all-features
160-
dep_tests: true
16188
os: ubuntu-18.04
16289

16390
name: ${{ matrix.toolchain }}
@@ -169,50 +96,45 @@ jobs:
16996
if: matrix.os == 'windows-latest'
17097

17198
- name: Checkout
172-
uses: actions/checkout@v1
99+
uses: actions/checkout@v2
173100

174-
- name: rust-toolchain
101+
- name: Setup ${{ matrix.toolchain }}
175102
uses: actions-rs/toolchain@v1
176103
with:
177104
toolchain: ${{ matrix.toolchain }}
178105
override: true
179106
profile: default
180107

181-
- name: '`cargo clippy --all-targets --profile test ${{ matrix.features }} -- -D warnings`'
182-
uses: actions-rs/cargo@v1
108+
- name: Setup Python 3.8
109+
uses: actions/setup-python@v1
183110
with:
184-
command: clippy
185-
args: --all-targets --profile test ${{ matrix.features }} -- -D warnings
111+
python-version: '3.8'
186112

187-
- name: '`cargo test --all-targets ${{ matrix.features }} --no-fail-fast`'
113+
- name: '`cargo clippy --all-targets --profile test -- -D warnings`'
188114
uses: actions-rs/cargo@v1
189115
with:
190-
command: test
191-
args: --all-targets ${{ matrix.features }} --no-fail-fast
116+
command: clippy
117+
args: --all-targets --profile test -- -D warnings
192118

193-
- name: '`cargo run --release`'
119+
- name: '`cargo clippy --manifest-path ./tools/test-examples/Cargo.toml -- -D warnings`'
194120
uses: actions-rs/cargo@v1
195121
with:
196-
command: run
197-
args: ${{ matrix.features }} --release
122+
command: clippy
123+
args: --manifest-path ./tools/test-examples/Cargo.toml -- -D warnings
198124

199-
- name: '`cargo clippy ${{ matrix.features }} --manifest-path ./tools/dep-tests/Cargo.toml -- -D warnings`'
125+
- name: '`cargo test --all-targets --no-fail-fast`'
200126
uses: actions-rs/cargo@v1
201127
with:
202-
command: clippy
203-
args: ${{ matrix.features }} --manifest-path ./tools/dep-tests/Cargo.toml -- -D warnings
204-
if: matrix.dep_tests
128+
command: test
129+
args: --all-targets --no-fail-fast
205130

206-
- name: '`cargo test ${{ matrix.features }} --manifest-path ./tools/dep-tests/Cargo.toml --no-fail-fast`'
131+
- name: '`cargo run --release`'
207132
uses: actions-rs/cargo@v1
208133
with:
209-
command: test
210-
args: ${{ matrix.features }} --manifest-path ./tools/dep-tests/Cargo.toml --no-fail-fast
211-
if: matrix.dep_tests
134+
command: run
135+
args: --release
212136

213-
- name: '`cargo dep-tests --all-features -d 1`'
137+
- name: '`cargo test-examples`'
214138
uses: actions-rs/cargo@v1
215139
with:
216-
command: dep-tests
217-
args: --all-features -d 1
218-
if: matrix.dep_tests
140+
command: test-examples

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/tools/dep-tests/Cargo.lock
21
/tools/test-examples/Cargo.lock
32
**/target/
43
**/*.rs.bk

0 commit comments

Comments
 (0)