commit 5836b489466382f3660f0beaea968c713fbef391
parent 24853c3c9f7b03d4c7f479ae0175a59702bfade6
Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
Date: Tue, 21 Oct 2025 12:03:04 +0000
Bug 1988387: Fix snap taskcluster test. r=gerard-majax
Since commit
7e44e48 Support building on RISC-V
There are no longer manual 'make' calls in the beta/core24 channel of Firefox.
For the purposes of this test, namely, checking that parallelism is enabled, it
suffices to match against the 'mach build' command instead.
Differential Revision: https://phabricator.services.mozilla.com/D265411
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/taskcluster/docker/snap-coreXX-build/run.sh b/taskcluster/docker/snap-coreXX-build/run.sh
@@ -114,7 +114,7 @@ if [ "${USE_SNAP_FROM_STORE_OR_MC}" = "0" ]; then
# Get the value and overwrite the snap's content.
MAX_CPUS=$(nproc)
sed -ri "s|\\\$CRAFT_PARALLEL_BUILD_COUNT|${MAX_CPUS}|g" snapcraft.yaml
- grep "make -j" snapcraft.yaml
+ grep "MACH build .*-j${MAX_CPUS}" snapcraft.yaml
SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY="${MAX_MEMORY_GB}G" \
snapcraft --destructive-mode --verbosity verbose --build-for "${ARCH}"
