Skip to content

Commit 7a1842c

Browse files
committed
Use manual invocations of cargo
1 parent 73a83e5 commit 7a1842c

File tree

2 files changed

+17
-68
lines changed

2 files changed

+17
-68
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,17 @@ jobs:
6464
if: runner.os == 'macOS'
6565
- uses: Swatinem/rust-cache@v1
6666
- name: run rust tests
67-
uses: actions-rs/cargo@v1
68-
with:
69-
command: test
70-
args: --workspace --exclude rustpython_wasm --verbose ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }}
67+
run: cargo test --workspace --exclude rustpython_wasm --verbose ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }}
7168
- name: check compilation without threading
72-
uses: actions-rs/cargo@v1
73-
with:
74-
command: check
75-
args: ${{ env.CARGO_ARGS }} --no-default-features
69+
run: cargo check ${{ env.CARGO_ARGS }} --no-default-features
7670

7771
- name: prepare AppleSilicon build
7872
uses: dtolnay/rust-toolchain@stable
7973
with:
8074
target: aarch64-apple-darwin
8175
if: runner.os == 'macOS'
8276
- name: Check compilation for Apple Silicon
83-
uses: actions-rs/cargo@v1
84-
with:
85-
command: check
86-
args: --target aarch64-apple-darwin
77+
run: cargo check --target aarch64-apple-darwin
8778
if: runner.os == 'macOS'
8879

8980
exotic_targets:
@@ -99,60 +90,42 @@ jobs:
9990
- name: Install gcc-multilib and musl-tools
10091
run: sudo apt-get update && sudo apt-get install gcc-multilib musl-tools
10192
- name: Check compilation for x86 32bit
102-
uses: actions-rs/cargo@v1
103-
with:
104-
command: check
105-
args: --target i686-unknown-linux-gnu
93+
run: cargo check --target i686-unknown-linux-gnu
10694

10795
- uses: dtolnay/rust-toolchain@stable
10896
with:
10997
target: aarch64-linux-android
11098

11199
- name: Check compilation for android
112-
uses: actions-rs/cargo@v1
113-
with:
114-
command: check
115-
args: --target aarch64-linux-android
100+
run: cargo check --target aarch64-linux-android
116101

117102
- uses: dtolnay/rust-toolchain@stable
118103
with:
119104
target: i686-unknown-linux-musl
120105

121106
- name: Check compilation for musl
122-
uses: actions-rs/cargo@v1
123-
with:
124-
command: check
125-
args: --target i686-unknown-linux-musl
107+
run: cargo check --target i686-unknown-linux-musl
126108

127109
- uses: dtolnay/rust-toolchain@stable
128110
with:
129111
target: x86_64-unknown-freebsd
130112

131113
- name: Check compilation for freebsd
132-
uses: actions-rs/cargo@v1
133-
with:
134-
command: check
135-
args: --target x86_64-unknown-freebsd
114+
run: cargo check --target x86_64-unknown-freebsd
136115

137116
- uses: dtolnay/rust-toolchain@stable
138117
with:
139118
target: wasm32-unknown-unknown
140119

141120
- name: Check compilation for wasm32
142-
uses: actions-rs/cargo@v1
143-
with:
144-
command: check
145-
args: --target wasm32-unknown-unknown --no-default-features
121+
run: cargo check --target wasm32-unknown-unknown --no-default-features
146122

147123
- uses: dtolnay/rust-toolchain@stable
148124
with:
149125
target: x86_64-unknown-freebsd
150126

151127
- name: Check compilation for freeBSD
152-
uses: actions-rs/cargo@v1
153-
with:
154-
command: check
155-
args: --target x86_64-unknown-freebsd
128+
run: cargo check --target x86_64-unknown-freebsd
156129

157130
- name: Prepare repository for redox compilation
158131
run: bash scripts/redox/uncomment-cargo.sh
@@ -188,10 +161,7 @@ jobs:
188161
if: runner.os == 'macOS'
189162
- uses: Swatinem/rust-cache@v1
190163
- name: build rustpython
191-
uses: actions-rs/cargo@v1
192-
with:
193-
command: build
194-
args: --release --verbose ${{ env.CARGO_ARGS }}
164+
run: cargo build --release --verbose ${{ env.CARGO_ARGS }}
195165
- uses: actions/setup-python@v2
196166
with:
197167
python-version: "3.10"
@@ -248,20 +218,11 @@ jobs:
248218
with:
249219
components: rustfmt, clippy
250220
- name: run rustfmt
251-
uses: actions-rs/cargo@v1
252-
with:
253-
command: fmt
254-
args: --all -- --check
221+
run: cargo fmt --all -- --check
255222
- name: run clippy
256-
uses: actions-rs/cargo@v1
257-
with:
258-
command: clippy
259-
args: ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }} -- -Dwarnings
223+
run: cargo clippy ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }} -- -Dwarnings
260224
- name: run clippy on wasm
261-
uses: actions-rs/cargo@v1
262-
with:
263-
command: clippy
264-
args: --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
225+
run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
265226
- uses: actions/setup-python@v2
266227
with:
267228
python-version: "3.10"
@@ -369,9 +330,6 @@ jobs:
369330
restore-keys: |
370331
${{ runner.os }}-debug_opt3-${{ hashFiles('**/Cargo.lock') }}
371332
- name: build rustpython
372-
uses: actions-rs/cargo@v1
373-
with:
374-
command: build
375-
args: --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
333+
run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
376334
- name: run snippets
377335
run: wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py

.github/workflows/cron-ci.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ jobs:
1818
with:
1919
components: llvm-tools-preview
2020
- run: sudo apt-get update && sudo apt-get -y install lcov
21-
- uses: actions-rs/cargo@v1
22-
with:
23-
command: build
24-
args: --release --verbose ${{ env.CARGO_ARGS }}
21+
- run: cargo build --release --verbose ${{ env.CARGO_ARGS }}
2522
env:
2623
RUSTC_WRAPPER: './scripts/codecoverage-rustc-wrapper.sh'
2724
- uses: actions/setup-python@v2
@@ -60,10 +57,7 @@ jobs:
6057
- uses: actions/checkout@v2
6158
- uses: dtolnay/rust-toolchain@stable
6259
- name: build rustpython
63-
uses: actions-rs/cargo@v1
64-
with:
65-
command: build
66-
args: --release --verbose
60+
run: cargo build --release --verbose
6761
- name: collect tests data
6862
run: cargo run --release extra_tests/jsontests.py
6963
env:
@@ -91,10 +85,7 @@ jobs:
9185
- uses: actions/checkout@v2
9286
- uses: dtolnay/rust-toolchain@stable
9387
- name: build rustpython
94-
uses: actions-rs/cargo@v1
95-
with:
96-
command: build
97-
args: --release --verbose
88+
run: cargo build --release --verbose
9889
- name: Collect what is left data
9990
run: |
10091
chmod +x ./whats_left.sh

0 commit comments

Comments
 (0)