From 61781e9abe9e79596bf8d43e75eda8c7c6ab8885 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Fri, 6 Oct 2023 11:52:21 +0000
Subject: [PATCH] Bug 1855152 - part 2: add macosx64-aarch64/debug build in CI.
 r=firefox-build-system-reviewers,taskgraph-reviewers,releng-reviewers,jmaher,glandium,ahal

Differential Revision: https://phabricator.services.mozilla.com/D189195
---
 taskcluster/ci/build-mac-signing/kind.yml |  1 +
 taskcluster/ci/build-signing/kind.yml     |  1 +
 taskcluster/ci/build/macosx.yml           | 32 +++++++++++++++++++++++
 taskcluster/ci/repackage/kind.yml         |  1 +
 4 files changed, 35 insertions(+)

diff --git a/taskcluster/ci/build-mac-signing/kind.yml b/taskcluster/ci/build-mac-signing/kind.yml
index bc301719105c..d90813cd966d 100644
--- a/taskcluster/ci/build-mac-signing/kind.yml
+++ b/taskcluster/ci/build-mac-signing/kind.yml
@@ -23,6 +23,7 @@ only-for-build-platforms:
     - macosx64-devedition/opt
     - macosx64/opt
     - macosx64/debug
+    - macosx64-aarch64/debug
 
 jobs:
     build-mac-signing:
diff --git a/taskcluster/ci/build-signing/kind.yml b/taskcluster/ci/build-signing/kind.yml
index bf8c48b34db1..7e4bbab419a1 100644
--- a/taskcluster/ci/build-signing/kind.yml
+++ b/taskcluster/ci/build-signing/kind.yml
@@ -26,6 +26,7 @@ not-for-build-platforms:
     - macosx64-devedition/opt
     - macosx64/opt
     - macosx64/debug
+    - macosx64-aarch64/debug
 
 jobs:
     build-signing:
diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml
index e84e2c097cbb..fe1407056e00 100644
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -52,6 +52,38 @@ macosx64/debug:
             - macosx64-sdk
             - sysroot-wasm32-wasi
 
+macosx64-aarch64/debug:
+    description: "MacOS X Aarch64 Cross-compile"
+    index:
+        job-name: macosx64-aarch64-debug
+    attributes:
+        enable-build-signing: true
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: osx-cross-aarch64/debug
+        symbol: B
+        tier: 1
+    worker:
+        max-run-time: 5400
+        env:
+            PERFHERDER_EXTRA_OPTIONS: aarch64
+    run:
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_mac_64_cross_builds.py
+        custom-build-variant-cfg: cross-debug
+        mozconfig-variant: debug
+        extra-config:
+            extra_mozconfig_content:
+                - ac_add_options --target=aarch64-apple-darwin
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - macosx64-sdk
+            - sysroot-wasm32-wasi
+
 macosx64-non-unified/plain:
     description: "MacOS X x64 Hybrid Cross-compile"
     index:
diff --git a/taskcluster/ci/repackage/kind.yml b/taskcluster/ci/repackage/kind.yml
index 0379408c6386..8e2f9e71c80c 100644
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -31,6 +31,7 @@ only-for-build-platforms:
     - macosx64-devedition/opt
     - macosx64/opt
     - macosx64/debug
+    - macosx64-aarch64/debug
     - win32-shippable/opt
     - win32-devedition/opt
     - win32/opt