aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2022-11-20 05:23:01 -0500
committerGitHub <noreply@github.com>2022-11-20 05:23:01 -0500
commitf1bb3dcad088073de5cfa11f2e992441b5d4467d (patch)
tree8171199850b40412423ad57c92f41feba545ba62
parent0847d2b316c8adb97128d434fb95ec730cb76e8e (diff)
parent969e022901f60912eb77b172b4eac066a9360322 (diff)
downloadservo-f1bb3dcad088073de5cfa11f2e992441b5d4467d.tar.gz
servo-f1bb3dcad088073de5cfa11f2e992441b5d4467d.zip
Auto merge of #29080 - servo:macos-upgrade, r=jdm
Build CI on macos-12 image. The macOS-10.15 images will be unsupported as of December 1, 2022.
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--.github/workflows/nightly.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 961fe690c4d..7395659aba0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -96,7 +96,7 @@ jobs:
build-mac:
name: Build (macOS)
- runs-on: macos-10.15
+ runs-on: macos-12
steps:
- name: Branch check
if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-mac', github.ref) }}
@@ -146,7 +146,7 @@ jobs:
# mac-wpt:
# #needs: build-mac
- # runs-on: macos-10.15
+ # runs-on: macos-10.12
# env:
# max_chunk_id: 20
# strategy:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5afe7a079b2..271a9d121f9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -34,7 +34,7 @@ jobs:
upload-mac:
name: Upload nightly (macOS)
- runs-on: macos-10.15
+ runs-on: macos-12
steps:
- uses: actions/checkout@v2
with: