commit d05c2fa267c37cc32e4b84b4a26f69a309ba53ba
parent 57d39164ab13ff3d7966a7f0d3299b19b6ba4690
Author: Tooru Fujisawa <arai_a@mac.com>
Date: Thu, 16 Oct 2025 11:58:16 +0000
Bug 1989240 - Part 2: Add searchfox job with macosx64-aarch64 opt build. r=releng-reviewers,taskgraph-reviewers,jcristau
Differential Revision: https://phabricator.services.mozilla.com/D268836
Diffstat:
5 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/browser/config/mozconfigs/macosx64/opt-searchfox b/browser/config/mozconfigs/macosx64/opt-searchfox
@@ -0,0 +1,9 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_CHECK=0
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+ac_add_options --enable-clang-plugin
+ac_add_options --enable-mozsearch-plugin
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py
@@ -1098,6 +1098,7 @@ def target_tasks_searchfox(full_task_graph, parameters, graph_config):
"searchfox-linux64-searchfox/opt",
"searchfox-linux64-searchfox/debug",
"searchfox-macosx64-searchfox/debug",
+ "searchfox-macosx64-aarch64-searchfox/opt",
"searchfox-macosx64-aarch64-searchfox/debug",
"searchfox-win64-searchfox/debug",
"searchfox-android-aarch64-searchfox/debug",
diff --git a/taskcluster/kinds/searchfox/kind.yml b/taskcluster/kinds/searchfox/kind.yml
@@ -136,6 +136,44 @@ tasks:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
+ macosx64-aarch64-searchfox/opt:
+ description: "MacOS X aarch64 Opt Cross-compile Searchfox"
+ index:
+ job-name: macosx64-aarch64-searchfox-opt
+ treeherder:
+ platform: osx-cross-aarch64/opt
+ worker:
+ max-run-time: 10800
+ env:
+ PERFHERDER_EXTRA_OPTIONS: searchfox
+ MOZSEARCH_PLATFORM: "macosx"
+ run:
+ using: mozharness
+ actions: [get-secrets, build]
+ config:
+ - builds/releng_base_firefox.py
+ - builds/releng_base_mac_64_cross_builds.py
+ extra-config:
+ extra_mozconfig_content:
+ - ac_add_options --target=aarch64-apple-darwin
+ script: "mozharness/scripts/fx_desktop_build.py"
+ custom-build-variant-cfg: cross-opt-searchfox
+ secrets: true
+ keep-artifacts: false
+ fetches:
+ toolchain:
+ - linux64-clang
+ - linux64-hfsplus
+ - linux64-libdmg
+ - linux64-nasm
+ - linux64-node
+ - linux64-rust-cross
+ - linux64-cbindgen
+ - linux64-dump_syms
+ - macosx64-sdk
+ - sysroot-x86_64-linux-gnu
+ - sysroot-wasm32-wasi
+
macosx64-aarch64-searchfox/debug:
description: "MacOS X aarch64 Debug Cross-compile Searchfox"
index:
diff --git a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_opt_searchfox.py b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_opt_searchfox.py
@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+
+config = {
+ "default_actions": [
+ "clobber",
+ "build",
+ ],
+ "stage_platform": "macosx64-searchfox-opt",
+ "debug_build": False,
+ #### 64 bit build specific #####
+ "env": {
+ "MOZBUILD_STATE_PATH": os.path.join(os.getcwd(), ".mozbuild"),
+ "HG_SHARE_BASE_DIR": "/builds/hg-shared",
+ "MOZ_OBJDIR": "%(abs_obj_dir)s",
+ "TINDERBOX_OUTPUT": "1",
+ "TOOLTOOL_CACHE": "/builds/tooltool_cache",
+ "TOOLTOOL_HOME": "/builds",
+ "MOZ_CRASHREPORTER_NO_REPORT": "1",
+ "LC_ALL": "C",
+ "XPCOM_DEBUG_BREAK": "stack-and-abort",
+ # 64 bit specific
+ "PATH": "/tools/python/bin:/opt/local/bin:/usr/bin:"
+ "/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin",
+ },
+ "mozconfig_variant": "opt-searchfox",
+}
diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -254,6 +254,7 @@ class BuildOptionParser:
"fuzzing-tsan-tc": path_base + "%s_fuzzing_tsan_tc.py",
"cross-debug": path_base + "%s_cross_debug.py",
"cross-debug-searchfox": path_base + "%s_cross_debug_searchfox.py",
+ "cross-opt-searchfox": path_base + "%s_cross_opt_searchfox.py",
"cross-noopt-debug": path_base + "%s_cross_noopt_debug.py",
"cross-fuzzing-asan": path_base + "%s_cross_fuzzing_asan.py",
"cross-fuzzing-debug": path_base + "%s_cross_fuzzing_debug.py",
