Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1574409 - Make mozconfig.cache useable for Thunderbird builds. r=firefox-build-system-reviewers,mshal

Browse Source 
Much of Firefox's mozocnfig.cache file is duplicated in Thunderbird's tree
in order to set a slightly different bucket name. This has led to broken buids
in the past.
The only difference is the first part of the name. With this change, a Thunderbird
mozconfig file can set $aws_prefix to "comm-central" before mozconfig.cache
gets included and be correctly configured.
GCP support is not required at this time.

Differential Revision: https://phabricator.services.mozilla.com/D61143

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Rob Lemley 2020-01-31 00:50:52 +00:00
parent 829aab8587
commit bcc6b23169
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/mozconfig.cache
View File

@ -4,6 +4,9 @@
# Setup for build cache
# Thunderbird builds will have this set prior to including this file
aws_prefix=${aws_prefix:-taskcluster}
# builds where buildprops didn't have the data (eg: taskcluster) and without sccache disabled:
if test -z "$bucket" -a -z "$SCCACHE_DISABLE"; then
@ -42,7 +45,7 @@ if test -z "$bucket" -a -z "$SCCACHE_DISABLE"; then
bucket=sccache-l${MOZ_SCM_LEVEL}-${region}
;;
aws)
bucket=taskcluster-level-${MOZ_SCM_LEVEL}-sccache-${region}
bucket=${aws_prefix}-level-${MOZ_SCM_LEVEL}-sccache-${region}
;;
esac
elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
@ -50,13 +53,13 @@ if test -z "$bucket" -a -z "$SCCACHE_DISABLE"; then
if test -z "$region"; then
region=${availability_zone::${#availability_zone}-2}
fi
bucket=taskcluster-level-${MOZ_SCM_LEVEL}-sccache-${region}
bucket=${aws_prefix}-level-${MOZ_SCM_LEVEL}-sccache-${region}
else
# ec2 region is az with last letter trimmed
if test -z "$region"; then
region=${availability_zone%?}
fi
bucket=taskcluster-level-${MOZ_SCM_LEVEL}-sccache-${region}
bucket=${aws_prefix}-level-${MOZ_SCM_LEVEL}-sccache-${region}
fi
fi
fi