Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Fix macOS CI failures #6523

Merged
merged 1 commit into from
May 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,17 @@ jobs:
browser: Edge
extra_flags: "--use-xvfb"

- os: macos-latest
# Use macos-13 for these browsers, due to
# https://github.com/shaka-project/shaka-player/issues/6508
# Matching checks for macos-13 below should be updated as well when
# this is reverted.
- os: macos-13
browser: Chrome
- os: macos-latest
- os: macos-13
browser: Firefox
- os: macos-latest
- os: macos-13
browser: Edge

- os: macos-latest
browser: Safari
- os: macos-latest
Expand Down Expand Up @@ -119,13 +124,21 @@ jobs:
# causing many of our test scenarios to fail. Deleting "Chrome for
# Testing" fixes this.
- name: 'Delete "Chrome for Testing" on Mac'
if: matrix.os == 'macos-latest' && matrix.browser == 'Chrome'
if: matrix.os == 'macos-13' && matrix.browser == 'Chrome'
run: sudo rm -rf /Applications/Google\ Chrome\ for\ Testing.app
- name: 'Overwrite "Chrome for Testing" on Windows'
if: matrix.os == 'windows-latest' && matrix.browser == 'Chrome'
shell: bash
run: choco install -y googlechrome --ignore-checksums

# Firefox and Edge might be missing on Mac CI images.
- name: 'Install Firefox on Mac'
if: matrix.os == 'macos-13' && matrix.browser == 'Firefox'
run: brew install --cask firefox
- name: 'Install Edge on Mac'
if: matrix.os == 'macos-13' && matrix.browser == 'Edge'
run: brew install --cask microsoft-edge

# Some CI images (self-hosted or otherwise) don't have the minimum Java
# version necessary for the compiler (Java 11).
- uses: actions/setup-java@v4
Expand Down