Skip to content

Commit aa5d095

Browse files
authored
macos ci: use latest x86 os, add macos arm64 os, etc. (#91)
1 parent 2f428f4 commit aa5d095

File tree

1 file changed

+77
-49
lines changed

1 file changed

+77
-49
lines changed

.github/workflows/ci.yml

Lines changed: 77 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
pull_request:
7-
branches: [ main ]
7+
branches: [main]
88
schedule:
99
- cron: "17 3 * * *"
1010

@@ -17,20 +17,37 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [ubuntu-latest, macos-11, windows-latest]
21-
toolchain: ["1.38.0", stable, beta, nightly ]
22-
features: ["", "--features std", "--features public_imp", "--features std,public_imp"]
23-
rustflags: ["-D warnings", "-D warnings -C target-feature=+avx2", "-D warnings -C target-feature=+sse4.2"]
20+
os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
21+
toolchain: ["1.38.0", stable, beta, nightly]
22+
features:
23+
[
24+
"",
25+
"--features std",
26+
"--features public_imp",
27+
"--features std,public_imp",
28+
]
29+
rustflags:
30+
[
31+
"-D warnings",
32+
"-D warnings -C target-feature=+avx2",
33+
"-D warnings -C target-feature=+sse4.2",
34+
]
2435
exclude:
25-
- os: macos-11
26-
rustflags: "-D warnings -C target-feature=+avx2"
36+
- os: macos-latest
37+
rustflags: "-D warnings -C target-feature=+avx2"
38+
- os: macos-latest
39+
rustflags: "-D warnings -C target-feature=+sse4.2"
40+
- os: macos-latest
41+
toolchain: "1.38.0"
42+
- os: macos-13
43+
toolchain: "1.38.0"
2744
steps:
2845
- uses: actions/checkout@v2
2946
- uses: actions-rs/toolchain@v1
3047
with:
31-
toolchain: ${{ matrix.toolchain }}
32-
profile: minimal
33-
override: true
48+
toolchain: ${{ matrix.toolchain }}
49+
profile: minimal
50+
override: true
3451
- name: Run tests
3552
run: cargo test --no-default-features ${{ matrix.features }} --all-targets --verbose
3653
env:
@@ -40,24 +57,24 @@ jobs:
4057
runs-on: ubuntu-latest
4158
strategy:
4259
matrix:
43-
toolchain: ["1.38.0", stable, beta, nightly ]
60+
toolchain: ["1.38.0", stable, beta, nightly]
4461
defaults:
4562
run:
4663
working-directory: inlining
4764
steps:
4865
- uses: actions/checkout@v2
4966
- uses: actions-rs/toolchain@v1
5067
with:
51-
toolchain: stable
52-
profile: minimal
53-
override: true
68+
toolchain: stable
69+
profile: minimal
70+
override: true
5471
- name: Install cargo-asm
5572
run: cargo install cargo-asm
5673
- uses: actions-rs/toolchain@v1
5774
with:
58-
toolchain: ${{ matrix.toolchain }}
59-
profile: minimal
60-
override: true
75+
toolchain: ${{ matrix.toolchain }}
76+
profile: minimal
77+
override: true
6178
- name: Set default toolchain
6279
run: rustup default ${{ matrix.toolchain }}
6380
- name: Check if the expected fns are inlined
@@ -81,10 +98,10 @@ jobs:
8198
- uses: actions/checkout@v2
8299
- uses: actions-rs/toolchain@v1
83100
with:
84-
toolchain: ${{ matrix.toolchain }}
85-
profile: minimal
86-
target: ${{ matrix.target }}
87-
override: true
101+
toolchain: ${{ matrix.toolchain }}
102+
profile: minimal
103+
target: ${{ matrix.target }}
104+
override: true
88105
- name: Install cargo-asm
89106
run: cargo install cargo-asm
90107
- name: Check if the expected fns are inlined
@@ -100,29 +117,29 @@ jobs:
100117
- uses: actions/checkout@v2
101118
- uses: actions-rs/toolchain@v1
102119
with:
103-
toolchain: nightly
104-
profile: minimal
105-
override: true
120+
toolchain: nightly
121+
profile: minimal
122+
override: true
106123
- name: Run cargo doc
107-
run: cargo doc --features public_imp
124+
run: cargo doc --features public_imp
108125
env:
109126
RUSTDOCFLAGS: --cfg docsrs
110127

111128
cross-build-arm-default:
112129
runs-on: ubuntu-latest
113130
strategy:
114131
matrix:
115-
toolchain: ["1.38.0", stable, beta, nightly ]
132+
toolchain: ["1.38.0", stable, beta, nightly]
116133
target: [arm-unknown-linux-gnueabi, aarch64-unknown-linux-gnu]
117134
features: ["--features std", ""]
118135
steps:
119136
- uses: actions/checkout@v2
120137
- uses: actions-rs/toolchain@v1
121138
with:
122-
toolchain: ${{ matrix.toolchain }}
123-
target: ${{ matrix.target }}
124-
profile: minimal
125-
override: true
139+
toolchain: ${{ matrix.toolchain }}
140+
target: ${{ matrix.target }}
141+
profile: minimal
142+
override: true
126143
- name: Build
127144
run: cargo build --no-default-features --target ${{ matrix.target }} ${{ matrix.features }} --verbose
128145

@@ -137,10 +154,10 @@ jobs:
137154
- uses: actions/checkout@v2
138155
- uses: actions-rs/toolchain@v1
139156
with:
140-
toolchain: ${{ matrix.toolchain }}
141-
target: ${{ matrix.target }}
142-
profile: minimal
143-
override: true
157+
toolchain: ${{ matrix.toolchain }}
158+
target: ${{ matrix.target }}
159+
profile: minimal
160+
override: true
144161
- name: Build
145162
run: cargo build --no-default-features --target ${{ matrix.target }} ${{ matrix.features }} --verbose
146163

@@ -150,8 +167,19 @@ jobs:
150167
matrix:
151168
os: [ubuntu-latest, windows-latest]
152169
toolchain: [stable, nightly]
153-
features: ["", "--features std", "--features public_imp", "--features std,public_imp"]
154-
rustflags: ["-D warnings", "-D warnings -C target-feature=+avx2", "-D warnings -C target-feature=+sse4.2"]
170+
features:
171+
[
172+
"",
173+
"--features std",
174+
"--features public_imp",
175+
"--features std,public_imp",
176+
]
177+
rustflags:
178+
[
179+
"-D warnings",
180+
"-D warnings -C target-feature=+avx2",
181+
"-D warnings -C target-feature=+sse4.2",
182+
]
155183
target: [i686-unknown-linux-gnu, i686-pc-windows-msvc]
156184
exclude:
157185
- os: ubuntu-latest
@@ -162,10 +190,10 @@ jobs:
162190
- uses: actions/checkout@v2
163191
- uses: actions-rs/toolchain@v1
164192
with:
165-
toolchain: ${{ matrix.toolchain }}
166-
target: ${{ matrix.target }}
167-
profile: minimal
168-
override: true
193+
toolchain: ${{ matrix.toolchain }}
194+
target: ${{ matrix.target }}
195+
profile: minimal
196+
override: true
169197
- name: Run tests
170198
run: cargo build --no-default-features ${{ matrix.features }} --target ${{ matrix.target }} --verbose
171199
env:
@@ -177,10 +205,10 @@ jobs:
177205
- uses: actions/checkout@v1
178206
- uses: actions-rs/toolchain@v1
179207
with:
180-
toolchain: stable
181-
profile: minimal
182-
components: rustfmt
183-
override: true
208+
toolchain: stable
209+
profile: minimal
210+
components: rustfmt
211+
override: true
184212
- name: Checko formatting
185213
run: cargo fmt -- --check
186214

@@ -190,10 +218,10 @@ jobs:
190218
- uses: actions/checkout@v1
191219
- uses: actions-rs/toolchain@v1
192220
with:
193-
toolchain: nightly
194-
profile: minimal
195-
components: clippy
196-
override: true
221+
toolchain: nightly
222+
profile: minimal
223+
components: clippy
224+
override: true
197225
- uses: actions-rs/clippy-check@v1
198226
with:
199227
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)