Skip to content

Commit 353c3f6

Browse files
committed
CI: macos support is best-effort, don't bother with anything special
1 parent d0badd2 commit 353c3f6

File tree

2 files changed

+7
-50
lines changed

2 files changed

+7
-50
lines changed

.github/workflows/CI-macOS.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ on:
3030

3131
env:
3232
RUSTFLAGS: "-Dwarnings"
33-
WITH_MIRI: ${{ inputs.rust-toolchain-name == 'nightly' && inputs.flavor == 'dev' }}
3433
SRC_DIR: ${{ github.workspace }}/rawspeed.rs
3534
CODECOV_TOKEN_EXISTS: ${{ secrets.CODECOV_TOKEN != '' }}
3635

@@ -61,7 +60,7 @@ jobs:
6160
brew autoremove --quiet
6261
brew cleanup --quiet --prune=all
6362
- name: Install Rust
64-
timeout-minutes: 7
63+
timeout-minutes: 4
6564
run: |
6665
set -xe
6766
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y
@@ -78,15 +77,6 @@ jobs:
7877
cargo-llvm-cov \
7978
"
8079
fi
81-
if [ "${{ env.WITH_MIRI }}" = "true" ]; then
82-
RUST_COMPONENTS="${RUST_COMPONENTS} \
83-
rust-src \
84-
miri \
85-
"
86-
RUST_CRATES="${RUST_CRATES} \
87-
cargo-nextest \
88-
"
89-
fi
9080
rustup component add ${RUST_COMPONENTS}
9181
if [ "${RUST_CRATES}" != "" ]; then
9282
cargo install ${RUST_CRATES}
@@ -157,11 +147,3 @@ jobs:
157147
files: ${{ env.SRC_DIR }}/codecov.json
158148
root_dir: ${{ env.SRC_DIR }}
159149
fail_ci_if_error: true
160-
- name: Run tests under Miri
161-
timeout-minutes: 10
162-
if: env.WITH_MIRI == 'true'
163-
run: |
164-
set -xe
165-
. "$HOME/.cargo/env"
166-
cd "$SRC_DIR"
167-
cargo miri nextest run

.github/workflows/CI.yml

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
flavor: ${{ matrix.flavor }}
113113
secrets:
114114
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
115-
macOS-fast:
115+
macOS:
116116
strategy:
117117
fail-fast: false
118118
matrix:
@@ -121,9 +121,6 @@ jobs:
121121
- { os: macos, os-ver: 13, host: "x86_64", target: "x86_64", XCode: 15.2, LLVM: 16 }
122122
rust-toolchain-name: [ stable, nightly ]
123123
flavor: [ dev, release ]
124-
exclude:
125-
- rust-toolchain-name: nightly
126-
flavor: dev
127124
uses: ./.github/workflows/CI-macOS.yml
128125
with:
129126
os: ${{ matrix.compiler.os }}
@@ -137,7 +134,7 @@ jobs:
137134
secrets:
138135
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
139136
linux-slow-native:
140-
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS-fast ]
137+
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS ]
141138
strategy:
142139
fail-fast: false
143140
matrix:
@@ -166,7 +163,7 @@ jobs:
166163
secrets:
167164
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
168165
linux-slow-cross:
169-
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS-fast ]
166+
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS ]
170167
strategy:
171168
fail-fast: false
172169
matrix:
@@ -198,7 +195,7 @@ jobs:
198195
secrets:
199196
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
200197
windows-slow:
201-
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS-fast ]
198+
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS ]
202199
strategy:
203200
fail-fast: false
204201
matrix:
@@ -232,31 +229,9 @@ jobs:
232229
flavor: ${{ matrix.flavor }}
233230
secrets:
234231
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
235-
macOS-slow:
236-
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS-fast ]
237-
strategy:
238-
fail-fast: false
239-
matrix:
240-
compiler:
241-
- { os: macos, os-ver: 15, host: "aarch64", target: "aarch64", XCode: 16.3, LLVM: 19 }
242-
- { os: macos, os-ver: 13, host: "x86_64", target: "x86_64", XCode: 15.2, LLVM: 16 }
243-
rust-toolchain-name: [ nightly ]
244-
flavor: [ dev ]
245-
uses: ./.github/workflows/CI-macOS.yml
246-
with:
247-
os: ${{ matrix.compiler.os }}
248-
runs-on: ${{ matrix.compiler.os }}-${{ matrix.compiler.os-ver }}
249-
builder-host: ${{ matrix.compiler.host }}
250-
builder-target: ${{ matrix.compiler.target }}
251-
xcode-version: ${{ matrix.compiler.XCode }}
252-
LLVM_VER: ${{ matrix.compiler.LLVM }}
253-
rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
254-
flavor: ${{ matrix.flavor }}
255-
secrets:
256-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
257232
build-docs:
258-
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS-fast,
259-
linux-slow-native, linux-slow-cross, windows-slow, macOS-slow]
233+
needs: [ linux-fast-native, linux-fast-cross, windows-fast, macOS,
234+
linux-slow-native, linux-slow-cross, windows-slow]
260235
uses: ./.github/workflows/CI-linux.yml
261236
with:
262237
os: linux

0 commit comments

Comments
 (0)