Skip to content

Commit

Permalink
ci: Streamline the old MacOS-12 CI test
Browse files Browse the repository at this point in the history
It's an old flavor not well supported by homebrew any longer, so
what's happening is that most of the dependency packages we ask to
install have to build from source, which means it takes a long long
time.

By disabling OpenCV and Qt homebrew installation for it, we can make
it fast again. Neither the minimal OpenCV interop, nor osltoy (the
only thing that needs Qt) are exercised by the automated testsuite
anyway, so I don't think there's any loss of testing functionality
in practice.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
lgritz committed Sep 30, 2024
1 parent c1318c1 commit 5bc14e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,9 @@ jobs:
cc_compiler: clang
cxx_compiler: clang++
cxx_std: 17
python_ver: "3.10"
python_ver: "3.11"
aclang: 13
setenvs: export INSTALL_QT=0 INSTALL_OPENCV=0
- desc: MacOS-13
runner: macos-13
nametag: macos13-py311
Expand All @@ -525,11 +526,11 @@ jobs:
simd: sse4.2,avx2
- desc: MacOS-14-ARM
runner: macos-14
nametag: macos14-arm-py311
nametag: macos14-arm-py312
cc_compiler: clang
cxx_compiler: clang++
cxx_std: 20
python_ver: "3.11"
python_ver: "3.12"
aclang: 15
runs-on: ${{ matrix.runner }}
env:
Expand Down
4 changes: 2 additions & 2 deletions src/build-scripts/install_homebrew_deps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ brew install --display-times -q freetype libraw dcmtk pybind11 numpy || true
brew install --display-times -q ffmpeg libheif ptex || true
brew install --display-times -q tbb || true
brew install --display-times -q openvdb || true
if [[ "${USE_OPENCV}" != "0" ]] ; then
if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
brew install --display-times -q opencv || true
fi
if [[ "${USE_QT}" != "0" ]] ; then
if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
brew install --display-times -q qt${QT_VERSION}
fi
if [[ "${USE_LLVM:=0}" != "0" ]] || [[ "${LLVMBREWVER}" != "" ]]; then
Expand Down

0 comments on commit 5bc14e6

Please sign in to comment.