Add support for mac arm (m1) runners

.github/workflows/dispatch-workflow.yml

@@ -39,6 +39,17 @@ jobs:
       unit-tests: ${{ inputs.unit-tests }}
       wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
 
+  macos-arm:
+    if: ${{ inputs.workflow == 'macos-arm' }}
+    uses: ./.github/workflows/mac.yml
+    secrets: inherit
+    with:
+      arm: true
+      profile: ${{ inputs.profile }}
+      wpt-layout: ${{ inputs.wpt-layout }}
+      unit-tests: ${{ inputs.unit-tests }}
+      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+
   linux:
     if: ${{ inputs.workflow == 'linux' }}
     name: Linux

.github/workflows/mac-wpt.yml

@@ -3,6 +3,10 @@ name: Mac WPT Tests
 on:
   workflow_call:
     inputs:
+      arm:
+        required: false
+        default: false
+        type: boolean
       wpt-tests-to-run:
         default: ""
         required: false
@@ -22,7 +26,7 @@ env:
 jobs:
   mac-wpt:
     name: WPT ${{ inputs.wpt-layout }}
-    runs-on: macos-13
+    runs-on: ${{ inputs.arm && 'macos-14' || 'macos-13' }}
     env:
       max_chunk_id: 5
     strategy:
@@ -40,7 +44,7 @@ jobs:
           ref: refs/pull/${{ github.event.number }}/head
       - uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs.profile }}-binary-macos
+          name: ${{ inputs.profile }}-binary-${{ inputs.arm && 'macos-arm' || 'macos' }}
       - name: Prep test environment
         run: |
           gtar -xzf target.tar.gz

.github/workflows/mac.yml

@@ -3,6 +3,10 @@ name: MacOS
 on:
   workflow_call:
     inputs:
+      arm:
+        required: false
+        default: false
+        type: boolean
       profile:
         required: false
         default: "release"
@@ -27,6 +31,10 @@ on:
         type: string
   workflow_dispatch:
     inputs:
+      arm:
+        required: false
+        default: false
+        type: boolean
       profile:
         required: false
         default: "release"
@@ -58,8 +66,8 @@ env:
 
 jobs:
   build:
-    name: MacOS Build
-    runs-on: macos-13
+    name: MacOS ${{ inputs.arm && 'ARM' || '' }} Build
+    runs-on: ${{ inputs.arm && 'macos-14' || 'macos-13' }}
     steps:
       # XProtect can cause random failures if it decides that the DMG we create
       # during the packaging phase is malware.
@@ -124,12 +132,12 @@ jobs:
       - name: Upload artifact for mach package
         uses: actions/upload-artifact@v4
         with:
-          name: mac
+          name: ${{ inputs.arm && 'mac-arm' || 'mac' }}
           path: target/${{ inputs.profile }}/servo-tech-demo.dmg
       - name: Upload nightly
         if: ${{ inputs.upload }}
         run: |
-          python3 ./mach upload-nightly mac --secret-from-environment \
+          python3 ./mach upload-nightly ${{ inputs.arm && 'mac-arm' || 'mac' }} --secret-from-environment \
             --github-release-id ${{ inputs.github-release-id }}
         env:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
@@ -141,7 +149,7 @@ jobs:
       - name: Upload package for target
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.profile }}-binary-macos
+          name: ${{ inputs.profile }}-binary-${{ inputs.arm && 'macos-arm' || 'macos' }}
           path: target.tar.gz
 
   wpt-2020:
@@ -150,6 +158,7 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/mac-wpt.yml
     with:
+      arm: ${{ inputs.arm }}
       profile: ${{ inputs.profile }}
       wpt-layout: "layout-2020"
       wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
@@ -161,6 +170,7 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/mac-wpt.yml
     with:
+      arm: ${{ inputs.arm }}
       profile: ${{ inputs.profile }}
       wpt-layout: "layout-2013"
       wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}

.github/workflows/main.yml

@@ -30,6 +30,15 @@ jobs:
       unit-tests: true
     secrets: inherit
 
+  build-mac-arm:
+    name: Mac Arm
+    if: ${{ github.event_name != 'pull_request' }}
+    uses: ./.github/workflows/mac.yml
+    with:
+      arm: true
+      unit-tests: true
+    secrets: inherit
+
   build-linux:
     name: Linux
     uses: ./.github/workflows/linux.yml

python/servo/package_commands.py

@@ -50,6 +50,9 @@
     'mac': [
         'production/servo-tech-demo.dmg',
     ],
+    'mac-arm': [
+        'production/servo-tech-demo.dmg',
+    ],
     'maven': [
         'android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/',
         'android/gradle/servoview/maven/org/mozilla/servoview/servoview-x86/',

python/servo/try_parser.py

@@ -42,10 +42,11 @@ def to_string(self):
 
 
 class Workflow(str, Enum):
-    LINUX = "linux"
-    MACOS = "macos"
-    WINDOWS = "windows"
-    ANDROID = "android"
+    LINUX = 'linux'
+    MACOS = 'macos'
+    MACOS_ARM = 'macos-arm'
+    WINDOWS = 'windows'
+    ANDROID = 'android'
 
 
 @dataclass
@@ -79,6 +80,8 @@ def handle_preset(s: str) -> Optional[JobConfig]:
         return JobConfig("Linux", Workflow.LINUX, unit_tests=True)
     elif s in ["mac", "macos"]:
         return JobConfig("MacOS", Workflow.MACOS, unit_tests=True)
+    elif s in ["mac-arm", "macos-arm"]:
+        return JobConfig("MacOS ARM", Workflow.MACOS_ARM, unit_tests=True)
     elif s in ["win", "windows"]:
         return JobConfig("Windows", Workflow.WINDOWS, unit_tests=True)
     elif s in ["wpt", "linux-wpt"]:
@@ -93,6 +96,12 @@ def handle_preset(s: str) -> Optional[JobConfig]:
         return JobConfig("MacOS WPT", Workflow.MACOS, wpt_layout=Layout.layout2013)
     elif s == "mac-wpt-2020":
         return JobConfig("MacOS WPT", Workflow.MACOS, wpt_layout=Layout.layout2020)
+    elif s == "mac-arm-wpt":
+        return JobConfig("MacOS ARM WPT", Workflow.MACOS_ARM, wpt_layout=Layout.all())
+    elif s == "mac-arm-wpt-2013":
+        return JobConfig("MacOS ARM WPT", Workflow.MACOS_ARM, wpt_layout=Layout.layout2013)
+    elif s == "mac-arm-wpt-2020":
+        return JobConfig("MacOS ARM WPT", Workflow.MACOS_ARM, wpt_layout=Layout.layout2020)
     elif s == "android":
         return JobConfig("Android", Workflow.ANDROID)
     elif s == "webgpu":
@@ -135,7 +144,7 @@ def parse(self, input: str):
                 self.fail_fast = True
                 continue  # skip over keyword
             if word == "full":
-                words.extend(["linux-wpt", "macos", "windows", "android"])
+                words.extend(["linux-wpt", "macos", "macos-arm", "windows", "android"])
                 continue  # skip over keyword
 
             job = handle_preset(word)
@@ -196,6 +205,14 @@ def test_empty(self):
                                   "unit_tests": True,
                                   "wpt_tests_to_run": ""
                               },
+                              {
+                                  "name": "MacOS ARM",
+                                  "workflow": "macos-arm",
+                                  "wpt_layout": "none",
+                                  "profile": "release",
+                                  "unit_tests": True,
+                                  "wpt_tests_to_run": ""
+                              },
                               {
                                   "name": "Windows",
                                   "workflow": "windows",
@@ -248,7 +265,7 @@ def test_job_merging(self):
         self.assertEqual(a, JobConfig("Linux", Workflow.LINUX, unit_tests=True))
 
     def test_full(self):
-        self.assertDictEqual(json.loads(Config("linux-wpt macos windows android").to_json()),
+        self.assertDictEqual(json.loads(Config("linux-wpt macos macos-arm windows android").to_json()),
                              json.loads(Config("").to_json()))