Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1664567 - Set MOZ_OBJDIR in builder scripts for CI r=glandium

Browse Source 
Without setting this variable, the call to `mach python` in `taskcluster/scripts/builder/build-linux.sh` will create a `virtualenv` in the default location -- on Linux in CI, that's `obj-x86_64-pc-linux-gnu`. Everything else about the build is going to end up in `obj-build`, so just set `MOZ_OBJDIR` appropriately to point to that directory.

Doing so enables us to land bug 1663755, as it causes the logic added to `symbols_archive.py` as part of bug 1654994 to behave as expected.

Differential Revision: https://phabricator.services.mozilla.com/D89975
This commit is contained in:
Ricky Stewart 2020-09-15 14:25:03 +00:00
parent d837bfd892
commit 233f65df7c
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taskcluster/scripts/builder/build-l10n.sh
View File

@ -28,6 +28,7 @@ echo "running as" $(id)
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
: MOZ_OBJDIR ${MOZ_OBJDIR:=$WORKSPACE/obj-build}
set -v
@ -66,6 +67,8 @@ fi
# entirely effective.
export TOOLTOOL_CACHE
export MOZ_OBJDIR
config_path_cmds=""
for path in ${MOZHARNESS_CONFIG_PATHS}; do
config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"

3
taskcluster/scripts/builder/build-linux.sh
View File

@ -27,6 +27,7 @@ echo "running as" $(id)
: MH_BUILD_POOL ${MH_BUILD_POOL:=staging}
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
: MOZ_OBJDIR ${MOZ_OBJDIR:=$WORKSPACE/obj-build}
set -v
@ -81,6 +82,8 @@ fi
# entirely effective.
export TOOLTOOL_CACHE
export MOZ_OBJDIR
config_path_cmds=""
for path in ${MOZHARNESS_CONFIG_PATHS}; do
config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"

3
taskcluster/scripts/builder/repackage.sh
View File

@ -23,6 +23,7 @@ echo "running as" $(id)
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
: MOZ_OBJDIR ${MOZ_OBJDIR:=$WORKSPACE/obj-build}
set -v
@ -62,6 +63,8 @@ fi
# entirely effective.
export TOOLTOOL_CACHE
export MOZ_OBJDIR
config_path_cmds=""
for path in ${MOZHARNESS_CONFIG_PATHS}; do
config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"