devops: fix firefox-beta build (#14495)

This patch:
- fixes firefox-beta archiving that requires 2 extra env variables
- attempts to use windows paths to specify `MOZ_FETCHES_DIR` on
  Windows to point to the toolchains folder.
This commit is contained in:
Andrey Lushnikov 2022-05-31 02:50:04 -06:00 committed by GitHub
parent 0855f3cbb4
commit 59c7e7aaa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions

View File

@ -1,2 +1,2 @@
1326
Changed: lushnikov@chromium.org Tue May 31 10:19:28 +03 2022
1327
Changed: lushnikov@chromium.org Tue May 31 11:00:16 +03 2022

View File

@ -40,6 +40,8 @@ OBJ_FOLDER="${FF_CHECKOUT_PATH}/obj-build-playwright"
cd "${FF_CHECKOUT_PATH}"
export MH_BRANCH=mozilla-beta
export MOZ_BUILD_DATE=$(date +%Y%m%d%H%M%S)
if [[ "$2" == "--linux-arm64" ]]; then
CMD_STRIP=/usr/bin/aarch64-linux-gnu-strip ./mach package
else

View File

@ -109,7 +109,15 @@ if [[ $1 == "--juggler" ]]; then
elif [[ $1 == "--bootstrap" ]]; then
./mach configure
else
MOZ_AUTOMATION=1 MOZ_FETCHES_DIR=$HOME/.mozbuild ./mach build
export MOZ_AUTOMATION=1
# Use winpaths instead of unix paths on Windows.
# note: 'cygpath' is not available in MozBuild shell.
if is_win; then
export MOZ_FETCHES_DIR="${USERPROFILE}\\.mozbuild"
else
export MOZ_FETCHES_DIR="${HOME}/.mozbuild"
fi
./mach build
if is_mac; then
node "${SCRIPT_FOLDER}"/install-preferences.js "$PWD"/${OBJ_FOLDER}/dist
else