Skip to content

Commit a92cacf

Browse files
bors[bot]Jonas Schievink
andauthored
Merge #11
11: CI: stop using actions-rs r=jonas-schievink a=jonas-schievink Also updates it to run on the `main` branch instead of `master`, which doesn't exist. Co-authored-by: Jonas Schievink <[email protected]>
2 parents 814d682 + b240133 commit a92cacf

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master, staging, trying ]
5+
branches: [ main, staging, trying ]
66
pull_request:
77

88
jobs:
@@ -31,12 +31,9 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v2
3333
- name: Install Rust
34-
uses: actions-rs/toolchain@v1
35-
with:
36-
toolchain: ${{ matrix.rust_version }}
37-
target: ${{ matrix.target }}
38-
profile: minimal
39-
override: true
34+
run: |
35+
rustup install --profile=minimal ${{ matrix.rust_version }}
36+
rustup target add ${{ matrix.target }}
4037
- name: Check
4138
run: cargo check --target ${{ matrix.target }}
4239
env:
@@ -47,11 +44,9 @@ jobs:
4744
steps:
4845
- uses: actions/checkout@v2
4946
- name: Install Rust stable
50-
uses: actions-rs/toolchain@v1
51-
with:
52-
toolchain: stable
53-
profile: minimal
54-
components: rustfmt
47+
run: |
48+
rustup install --profile=minimal stable
49+
rustup component add rustfmt
5550
- name: Check fmt
5651
run: cargo fmt -- --check
5752

0 commit comments

Comments
 (0)