Skip to content

Commit 84ee5cf

Browse files
authored
Merge pull request #139 from JulianSchmid/ci-upgrade
Update ci jobs
2 parents 47ba2c4 + 20e706c commit 84ee5cf

1 file changed

Lines changed: 22 additions & 46 deletions

File tree

.github/workflows/main.yml

Lines changed: 22 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -45,75 +45,47 @@ jobs:
4545
rust: stable-x86_64-gnu
4646
steps:
4747

48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v4
4949

50-
- uses: actions-rs/toolchain@v1
50+
- uses: dtolnay/rust-toolchain@master
5151
with:
52-
profile: minimal
5352
toolchain: ${{ matrix.rust }}
54-
override: true
5553

5654
- name: cargo build
5755
if: matrix.target == ''
58-
uses: actions-rs/cargo@v1
59-
with:
60-
command: build
56+
run: cargo build
6157

6258
- name: install cross
6359
if: matrix.target != ''
6460
run: cargo install cross --locked
6561

6662
- name: cross build
6763
if: matrix.target != ''
68-
uses: actions-rs/cargo@v1
69-
with:
70-
use-cross: true
71-
command: build
72-
args: --target ${{ matrix.target }}
64+
run: cross build --target ${{ matrix.target }}
7365

7466
- name: cargo test
7567
if: matrix.target == ''
76-
uses: actions-rs/cargo@v1
77-
with:
78-
command: test
68+
run: cargo test
7969

8070
- name: cross test
8171
if: matrix.target != ''
82-
uses: actions-rs/cargo@v1
83-
with:
84-
use-cross: true
85-
command: test
86-
args: --target ${{ matrix.target }}
72+
run: cross test --target ${{ matrix.target }}
8773

8874
- name: cargo build --no-default-features
8975
if: matrix.target == ''
90-
uses: actions-rs/cargo@v1
91-
with:
92-
command: build
93-
args: --no-default-features
76+
run: cargo build --no-default-features
9477

9578
- name: cross build --no-default-features
9679
if: matrix.target != ''
97-
uses: actions-rs/cargo@v1
98-
with:
99-
use-cross: true
100-
command: build
101-
args: --target ${{ matrix.target }} --no-default-features
80+
run: cross build --target ${{ matrix.target }} --no-default-features
10281

10382
- name: cargo test --no-default-features
10483
if: matrix.target == ''
105-
uses: actions-rs/cargo@v1
106-
with:
107-
command: test
108-
args: --no-default-features
84+
run: cargo test --no-default-features
10985

11086
- name: cross test --no-default-features
11187
if: matrix.target != ''
112-
uses: actions-rs/cargo@v1
113-
with:
114-
use-cross: true
115-
command: test
116-
args: --target ${{ matrix.target }} --no-default-features
88+
run: cross test --target ${{ matrix.target }} --no-default-features
11789

11890
no_std_build:
11991
name: no_std build
@@ -122,18 +94,22 @@ jobs:
12294
run:
12395
working-directory: ./etherparse/ensure_no_std
12496
steps:
125-
- uses: actions/checkout@v2
126-
- uses: actions-rs/toolchain@v1
97+
- uses: actions/checkout@v4
98+
- uses: dtolnay/rust-toolchain@stable
12799
with:
128-
profile: minimal
129-
toolchain: stable
130-
target: x86_64-unknown-none
131-
override: true
100+
targets: x86_64-unknown-none
132101
- run: cargo build --target x86_64-unknown-none
133102

134103
msrv:
135104
runs-on: ubuntu-latest
136105
steps:
137106
- uses: actions/checkout@v4
138-
- uses: taiki-e/install-action@cargo-hack
139-
- run: cargo hack check --rust-version --workspace --all-targets --ignore-private
107+
- name: read rust-version from Cargo.toml
108+
id: msrv
109+
run: |
110+
MSRV=$(sed -n 's/^rust-version *= *"\(.*\)"/\1/p' etherparse/Cargo.toml)
111+
echo "version=$MSRV" >> "$GITHUB_OUTPUT"
112+
- uses: dtolnay/rust-toolchain@master
113+
with:
114+
toolchain: ${{ steps.msrv.outputs.version }}
115+
- run: cargo check --package etherparse --all-features

0 commit comments

Comments
 (0)