Commit 5586821
authored
### Rationale for this change
Homebrew treats x86_64 macOS as a [tier 3
configuration](https://docs.brew.sh/Support-Tiers#tier-3) and rarely
builds bottles for it. `brew bundle` doesn't build from source, so the
`JNI macos-15-intel x86_64` job in the RC workflow aborts in `Install
dependencies` with `no bottle available!` before anything is compiled.
We've been patching this formula by formula:
* #1269 skipped `aws-sdk-cpp` and gRPC.
* #1270 skipped Node.js.
Any new dependency added to `apache/arrow`'s `cpp/Brewfile` can break
the job again the same way, and nightly RC runs go red on `main` when it
does. We can't keep this job green on a configuration Homebrew doesn't
support.
#1269 noted that dropping the `macos-15-intel` entry needed its own
discussion because it's user-facing. #1305 is that discussion.
### What changes are included in this PR?
`rc.yml`:
* Removed the `macos-15-intel` / `x86_64` entry from the `jni-macos`
matrix.
* `binaries` no longer extracts `jni-macos-x86_64.tar.gz` nor asserts
the four `jni/*/x86_64/*.dylib` files.
* Dropped the `/usr/local` `python@XXX --overwrite` conflict loop. Its
comment already said it could go once we dropped `macos-15-intel`, since
`macos-14` and later on arm64 use `/opt/homebrew`. `brew update` is
kept.
* Unwrapped the `pkg-config` uninstall from its `if [ "$(uname -m)" =
"arm64" ]` guard, which is now always true.
* Trimmed the tier-3 justification from the `HOMEBREW_BUNDLE_BREW_SKIP`
comment. The skip list itself is unchanged: `aws-sdk-cpp` and gRPC are
still skipped so the bundled static ones are used, and Node.js is still
skipped because the JNI build doesn't need it.
`test.yml`:
* Removed the `AMD64` / `macos-15-intel` entry from the `macos` test
matrix, leaving `AArch64` on `macos-latest`.
`ci/scripts/jni_macos_build.sh` is untouched, so building the JNI
libraries locally on an Intel Mac still works.
### Are these changes tested?
Yes, by CI. The remaining `JNI macos-14 aarch_64` job exercises the
changed `Install dependencies` step, and `binaries` exercises the
changed artifact extraction and verification.
### Are there any user-facing changes?
Yes. Release JARs no longer bundle x86_64 macOS `.dylib` files for
`arrow_cdata_jni`, `arrow_dataset_jni`, `arrow_orc_jni` and
`gandiva_jni`. Intel Mac users of those modules will need to build the
JNI libraries themselves. aarch64 macOS, x86_64 and aarch64 Linux, and
x86_64 Windows are unaffected.
Closes #1305.
1 parent d035fc8 commit 5586821
2 files changed
Lines changed: 6 additions & 43 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
165 | | - | |
166 | 165 | | |
167 | 166 | | |
168 | 167 | | |
| |||
211 | 210 | | |
212 | 211 | | |
213 | 212 | | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | 213 | | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | 214 | | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
238 | 220 | | |
239 | 221 | | |
240 | 222 | | |
241 | 223 | | |
242 | 224 | | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
| 225 | + | |
254 | 226 | | |
255 | 227 | | |
256 | 228 | | |
| |||
388 | 360 | | |
389 | 361 | | |
390 | 362 | | |
391 | | - | |
392 | 363 | | |
393 | 364 | | |
394 | 365 | | |
| |||
405 | 376 | | |
406 | 377 | | |
407 | 378 | | |
408 | | - | |
409 | | - | |
410 | | - | |
411 | | - | |
412 | | - | |
413 | 379 | | |
414 | 380 | | |
415 | 381 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | 90 | | |
94 | 91 | | |
95 | 92 | | |
| |||
0 commit comments