Skip to content

Commit 1a5d651

Browse files
committed
Clean up CI config
1 parent 4340a7f commit 1a5d651

File tree

1 file changed

+31
-9
lines changed

1 file changed

+31
-9
lines changed

.github/workflows/ci.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,20 @@ on:
66
branches:
77
- master
88
schedule:
9-
- cron: '0 2 * * *'
9+
- cron: '0 2 * * 0'
1010

1111
env:
12-
RUSTFLAGS: -D warnings
12+
CARGO_INCREMENTAL: 0
13+
CARGO_NET_RETRY: 10
14+
CARGO_TERM_COLOR: always
1315
RUST_BACKTRACE: 1
16+
RUSTFLAGS: -D warnings
17+
RUSTDOCFLAGS: -D warnings
18+
RUSTUP_MAX_RETRIES: 10
19+
20+
defaults:
21+
run:
22+
shell: bash
1423

1524
jobs:
1625
test:
@@ -51,7 +60,6 @@ jobs:
5160
for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a ; do
5261
cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/x86_64-w64-mingw32/lib/$i" "`rustc --print sysroot`/lib/rustlib/x86_64-pc-windows-gnu/lib"
5362
done
54-
shell: bash
5563
- run: cargo build --target ${{ matrix.target }} --all --all-features --all-targets
5664
- run: cargo test --target ${{ matrix.target }}
5765

@@ -82,21 +90,34 @@ jobs:
8290
- name: iOS
8391
if: startsWith(matrix.os, 'macos')
8492
run: cross build --target aarch64-apple-ios
85-
# - name: illumos
86-
# if: startsWith(matrix.os, 'ubuntu')
87-
# run: cross build --target x86_64-unknown-illumos
93+
- name: Linux x32
94+
if: startsWith(matrix.os, 'ubuntu')
95+
run: cross check --target x86_64-unknown-linux-gnux32
96+
- name: Fuchsia
97+
if: startsWith(matrix.os, 'ubuntu')
98+
run: |
99+
rustup target add x86_64-fuchsia
100+
cargo build --target x86_64-fuchsia
101+
- name: illumos
102+
if: startsWith(matrix.os, 'ubuntu')
103+
run: |
104+
rustup target add x86_64-unknown-illumos
105+
cargo build --target x86_64-unknown-illumos
88106
89107
msrv:
90-
runs-on: ubuntu-latest
108+
runs-on: ${{ matrix.os }}
91109
strategy:
110+
fail-fast: false
92111
matrix:
112+
os: [ubuntu-latest, windows-latest]
93113
# When updating this, the reminder to update the minimum supported
94114
# Rust version in Cargo.toml.
95115
rust: ['1.48']
96116
steps:
97117
- uses: actions/checkout@v3
98118
- name: Install Rust
99-
run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
119+
# --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
120+
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
100121
- run: cargo build
101122

102123
clippy:
@@ -119,6 +140,7 @@ jobs:
119140
runs-on: ubuntu-latest
120141
steps:
121142
- uses: actions/checkout@v3
122-
- uses: actions-rs/audit-check@v1
143+
# https://github.com/rustsec/audit-check/issues/2
144+
- uses: rustsec/audit-check@master
123145
with:
124146
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)