Skip to content

Commit

Permalink
ci: Switch to use macos-latest (#7592)
Browse files Browse the repository at this point in the history
Closes #6508
  • Loading branch information
avelad authored and joeyparrish committed Nov 19, 2024
1 parent 2d6dabe commit fc6f04e
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,10 @@ jobs:
browser: Opera
extra_flags: "--use-xvfb"

# 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
- os: macos-latest
browser: Chrome
- os: macos-13
- os: macos-latest
browser: Edge

- os: macos-latest
browser: Opera
- os: macos-latest
Expand Down Expand Up @@ -138,7 +133,7 @@ jobs:
# Testing" fixes this.
- name: 'Delete "Chrome for Testing" on Mac'
timeout-minutes: 5
if: matrix.os == 'macos-13' && matrix.browser == 'Chrome'
if: matrix.os == 'macos-latest' && matrix.browser == 'Chrome'
run: sudo rm -rf /Applications/Google\ Chrome\ for\ Testing.app
- name: 'Overwrite "Chrome for Testing" on Windows'
timeout-minutes: 5
Expand All @@ -163,7 +158,7 @@ jobs:
run: brew install --cask firefox
- name: 'Install Edge on Mac'
timeout-minutes: 5
if: matrix.os == 'macos-13' && matrix.browser == 'Edge'
if: matrix.os == 'macos-latest' && matrix.browser == 'Edge'
run: brew install --cask microsoft-edge
- name: 'Install Opera on Mac'
timeout-minutes: 5
Expand Down

0 comments on commit fc6f04e

Please sign in to comment.