Skip to content

Commit b19a78c

Browse files
FabianLarsFabianLars
authored
ci: Remove actions-rs usage (#13454)
1 parent cace9f4 commit b19a78c

15 files changed

+43
-141
lines changed

‎.github/workflows/bench.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636
- name: install ${{ matrix.rust }}
37-
uses: actions-rs/toolchain@v1
37+
uses: dtolnay/rust-toolchain@master
3838
with:
3939
toolchain: ${{ matrix.rust }}
40-
override: true
41-
default: true
4240
components: rust-src
43-
target: ${{ matrix.platform.target }}
41+
targets: ${{ matrix.platform.target }}
4442

4543
- name: setup python
4644
uses: actions/setup-python@v2

‎.github/workflows/check-generated-files.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@ jobs:
5858
steps:
5959
- uses: actions/checkout@v4
6060

61-
- name: install stable
62-
uses: actions-rs/toolchain@v1
63-
with:
64-
toolchain: stable
65-
override: true
61+
- uses: dtolnay/rust-toolchain@stable
6662

6763
- name: install Linux dependencies
6864
run: |
@@ -74,10 +70,7 @@ jobs:
7470
workspaces: core -> ../target
7571

7672
- name: generate schema.json
77-
uses: actions-rs/cargo@v1
78-
with:
79-
command: build
80-
args: --manifest-path ./core/tauri-config-schema/Cargo.toml
73+
run: cargo build --manifest-path ./core/tauri-config-schema/Cargo.toml
8174

8275
- name: check schema
8376
run: ./.scripts/ci/has-diff.sh

‎.github/workflows/covector-version-or-publish.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ jobs:
2222
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
25-
- name: install stable
26-
uses: actions-rs/toolchain@v1
27-
with:
28-
toolchain: stable
25+
26+
- uses: dtolnay/rust-toolchain@stable
27+
2928
- name: install Linux dependencies
3029
if: matrix.platform == 'ubuntu-22.04'
3130
run: |
@@ -39,10 +38,7 @@ jobs:
3938
tooling/cli
4039
4140
- name: build CLI
42-
uses: actions-rs/cargo@v1
43-
with:
44-
command: build
45-
args: --manifest-path ./tooling/cli/Cargo.toml
41+
run: cargo build --manifest-path ./tooling/cli/Cargo.toml
4642

4743
- name: run integration tests
4844
run: cargo test --test '*' -- --ignored

‎.github/workflows/docker.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@v4
2121

22-
- name: install stable
23-
uses: actions-rs/toolchain@v1
24-
with:
25-
toolchain: stable
22+
- uses: dtolnay/rust-toolchain@stable
2623

2724
- name: install Linux dependencies
2825
run: |
@@ -40,10 +37,7 @@ jobs:
4037
if-no-files-found: error
4138

4239
- name: build CLI
43-
uses: actions-rs/cargo@v1
44-
with:
45-
command: build
46-
args: --manifest-path ./tooling/cli/Cargo.toml
40+
run: cargo build --manifest-path ./tooling/cli/Cargo.toml
4741

4842
- name: Upload CLI
4943
uses: actions/upload-artifact@v4
@@ -66,13 +60,9 @@ jobs:
6660
- name: Checkout
6761
uses: actions/checkout@v4
6862

69-
- name: install stable
70-
uses: actions-rs/toolchain@v1
63+
- uses: dtolnay/rust-toolchain@stable
7164
with:
72-
toolchain: stable
73-
override: true
74-
default: true
75-
target: ${{ matrix.target.name }}
65+
targets: ${{ matrix.target.name }}
7666

7767
- name: Setup node
7868
uses: actions/setup-node@v4

‎.github/workflows/lint-cli.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,21 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v4
3131

32-
- uses: actions-rs/toolchain@v1
32+
- uses: dtolnay/rust-toolchain@stable
3333
with:
34-
profile: minimal
35-
toolchain: stable
36-
override: true
3734
components: rustfmt
3835

39-
- uses: actions-rs/cargo@v1
40-
with:
41-
command: fmt
42-
args: --manifest-path ./tooling/cli/Cargo.toml --all -- --check
36+
- name: Check formatting
37+
run: cargo fmt --manifest-path ./tooling/cli/Cargo.toml --all -- --check
4338

4439
clippy:
4540
runs-on: ubuntu-latest
4641

4742
steps:
4843
- uses: actions/checkout@v4
4944

50-
- uses: actions-rs/toolchain@v1
45+
- uses: dtolnay/rust-toolchain@stable
5146
with:
52-
profile: minimal
53-
toolchain: stable
54-
override: true
5547
components: clippy
5648

5749
- name: install dependencies
@@ -63,8 +55,5 @@ jobs:
6355
with:
6456
workspaces: tooling/cli
6557

66-
- uses: actions-rs/clippy-check@v1
67-
with:
68-
token: ${{ secrets.GITHUB_TOKEN }}
69-
args: --manifest-path ./tooling/cli/Cargo.toml --all-targets --all-features -- -D warnings
70-
name: cli
58+
- name: Run clippy
59+
run: cargo clippy --manifest-path ./tooling/cli/Cargo.toml --all-targets --all-features -- -D warnings

‎.github/workflows/lint-core.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v4
3333

34-
- uses: actions-rs/toolchain@v1
34+
- uses: dtolnay/rust-toolchain@stable
3535
with:
36-
profile: minimal
37-
toolchain: stable
38-
override: true
3936
components: rustfmt
4037

41-
- uses: actions-rs/cargo@v1
42-
with:
43-
command: fmt
44-
args: --all -- --check
38+
- run: cargo fmt --all -- --check
4539

4640
clippy:
4741
runs-on: ubuntu-22.04
@@ -64,20 +58,13 @@ jobs:
6458
sudo apt-get update
6559
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
6660
67-
- uses: actions-rs/toolchain@v1
61+
- uses: dtolnay/rust-toolchain@stable
6862
with:
69-
profile: minimal
70-
toolchain: stable
71-
override: true
7263
components: clippy
7364

7465
- uses: Swatinem/rust-cache@v2
7566
with:
7667
workspaces: core -> ../target
7768
save-if: ${{ matrix.clippy.key == 'all' }}
7869

79-
- uses: actions-rs/clippy-check@v1
80-
with:
81-
token: ${{ secrets.GITHUB_TOKEN }}
82-
args: --manifest-path ./core/tauri/Cargo.toml --all-targets ${{ matrix.clippy.args }} -- -D warnings
83-
name: ${{ matrix.clippy.key }}
70+
- run: cargo clippy --manifest-path ./core/tauri/Cargo.toml --all-targets ${{ matrix.clippy.args }} -- -D warnings

‎.github/workflows/publish-cli-js.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,10 @@ jobs:
101101
cache: yarn
102102
cache-dependency-path: "tooling/cli/node/yarn.lock"
103103
architecture: ${{ matrix.settings.architecture }}
104-
- name: Install
105-
uses: actions-rs/toolchain@v1
104+
- uses: dtolnay/rust-toolchain@stable
106105
if: ${{ !matrix.settings.docker }}
107106
with:
108-
profile: minimal
109-
override: true
110-
toolchain: stable
111-
target: ${{ matrix.settings.target }}
107+
targets: ${{ matrix.settings.target }}
112108
- uses: Swatinem/rust-cache@v1
113109
with:
114110
key: ${{ matrix.settings.target }}

‎.github/workflows/publish-cli-rs.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ jobs:
5959
sudo apt-get install -y libgtk-3-dev
6060
6161
- name: Build CLI
62-
uses: actions-rs/cargo@v1
63-
with:
64-
command: build
65-
args: --manifest-path ./tooling/cli/Cargo.toml --release ${{ matrix.config.args }}
62+
run: cargo build --manifest-path ./tooling/cli/Cargo.toml --release ${{ matrix.config.args }}
6663

6764
- name: Upload CLI
6865
uses: actions/upload-artifact@v4

‎.github/workflows/test-cli-js.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ jobs:
3636
- uses: actions/checkout@v4
3737

3838
- name: install Rust stable
39-
uses: actions-rs/toolchain@v1
40-
with:
41-
toolchain: 1.71
42-
override: true
39+
uses: dtolnay/[email protected]
40+
4341
- name: setup node
4442
uses: actions/setup-node@v4
4543
with:

‎.github/workflows/test-cli-rs.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ jobs:
3535
- uses: actions/checkout@v4
3636

3737
- name: install stable
38-
uses: actions-rs/toolchain@v1
39-
with:
40-
toolchain: 1.71.0
41-
override: true
38+
uses: dtolnay/[email protected]
4239

4340
- name: install Linux dependencies
4441
if: matrix.platform == 'ubuntu-latest'
@@ -51,7 +48,4 @@ jobs:
5148
workspaces: tooling/cli
5249

5350
- name: test CLI
54-
uses: actions-rs/cargo@v1
55-
with:
56-
command: test
57-
args: --manifest-path ./tooling/cli/Cargo.toml
51+
run: cargo test --manifest-path ./tooling/cli/Cargo.toml

‎.github/workflows/test-core.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,10 @@ jobs:
6565
steps:
6666
- uses: actions/checkout@v4
6767

68-
- name: install stable
69-
uses: actions-rs/toolchain@v1
68+
- uses: dtolnay/rust-toolchain@stable
7069
with:
7170
toolchain: ${{ matrix.platform.toolchain }}
72-
target: ${{ matrix.platform.target }}
73-
override: true
74-
default: true
71+
targets: ${{ matrix.platform.target }}
7572

7673
- name: install Linux dependencies
7774
if: contains(matrix.platform.target, 'unknown-linux')

‎.github/workflows/test-lint-bundler.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636

37-
- name: install stable
38-
uses: actions-rs/toolchain@v1
39-
with:
40-
toolchain: stable
37+
- uses: dtolnay/rust-toolchain@stable
4138

4239
- uses: Swatinem/rust-cache@v2
4340
with:
@@ -54,17 +51,11 @@ jobs:
5451
steps:
5552
- uses: actions/checkout@v4
5653

57-
- uses: actions-rs/toolchain@v1
54+
- uses: dtolnay/rust-toolchain@stable
5855
with:
59-
profile: minimal
60-
toolchain: stable
61-
override: true
6256
components: rustfmt
6357

64-
- uses: actions-rs/cargo@v1
65-
with:
66-
command: fmt
67-
args: --manifest-path ./tooling/bundler/Cargo.toml --all -- --check
58+
- run: cargo fmt --manifest-path ./tooling/bundler/Cargo.toml --all -- --check
6859

6960
clippy:
7061
runs-on: ubuntu-22.04
@@ -73,21 +64,13 @@ jobs:
7364
- uses: actions/checkout@v4
7465

7566
- name: install minimal stable with clippy and rustfmt
76-
uses: actions-rs/toolchain@v1
67+
uses: dtolnay/rust-toolchain@stable
7768
with:
78-
profile: minimal
79-
toolchain: stable
80-
override: true
81-
default: true
8269
components: rustfmt, clippy
8370

8471
- uses: Swatinem/rust-cache@v2
8572
with:
8673
workspaces: tooling/bundler
8774

8875
- name: clippy check
89-
uses: actions-rs/clippy-check@v1
90-
with:
91-
token: ${{ secrets.GITHUB_TOKEN }}
92-
args: --manifest-path ./tooling/bundler/Cargo.toml --all-targets -- -D warnings
93-
name: bundler
76+
run: cargo clippy --manifest-path ./tooling/bundler/Cargo.toml --all-targets -- -D warnings

‎.github/workflows/test-updater-artifacts.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ jobs:
3131

3232
steps:
3333
- uses: actions/checkout@v4
34-
- name: install stable
35-
uses: actions-rs/toolchain@v1
36-
with:
37-
toolchain: stable
34+
35+
- uses: dtolnay/rust-toolchain@stable
3836

3937
- name: install Linux dependencies
4038
if: matrix.platform == 'ubuntu-22.04'

‎.github/workflows/udeps.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,9 @@ jobs:
7474
steps:
7575
- uses: actions/checkout@v4
7676

77-
- uses: actions-rs/toolchain@v1
78-
with:
79-
profile: minimal
80-
toolchain: nightly
81-
override: true
77+
- uses: dtolnay/rust-toolchain@nightly
8278

83-
- uses: actions-rs/cargo@v1
84-
with:
85-
command: install
86-
args: cargo-udeps --locked --force
79+
- run: cargo install cargo-udeps --locked --force
8780

8881
- name: Upload udeps
8982
uses: actions/upload-artifact@v4
@@ -128,11 +121,7 @@ jobs:
128121
steps:
129122
- uses: actions/checkout@v4
130123

131-
- uses: actions-rs/toolchain@v1
132-
with:
133-
profile: minimal
134-
toolchain: nightly
135-
override: true
124+
- uses: dtolnay/rust-toolchain@nightly
136125

137126
- name: install dependencies
138127
run: |
@@ -159,7 +148,4 @@ jobs:
159148
sudo apt-get update
160149
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
161150
162-
- uses: actions-rs/cargo@v1
163-
with:
164-
command: udeps
165-
args: --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features
151+
- run: cargo udeps --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features

‎core/tauri/src/api/ipc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const MIN_JSON_PARSE_LEN: usize = 10_240;
4646
///
4747
/// 1. `serde_json`'s ability to correctly escape and format json into a string.
4848
/// 2. JavaScript engines not accepting anything except another unescaped, literal single quote
49-
/// character to end a string that was opened with it.
49+
/// character to end a string that was opened with it.
5050
///
5151
/// # Examples
5252
///

0 commit comments

Comments
 (0)