зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1409044 - Pass the tooltool authentication file in Spidermonkey builds. r=Callek
This commit is contained in:
Родитель
211cfa1cfd
Коммит
fe61232e43
|
@ -25,12 +25,15 @@ esac
|
|||
case "$OSTYPE" in
|
||||
darwin*)
|
||||
PLATFORM_OS=macosx
|
||||
TOOLTOOL_AUTH_FILE=/builds/relengapi.tok
|
||||
;;
|
||||
linux-gnu)
|
||||
PLATFORM_OS=linux
|
||||
TOOLTOOL_AUTH_FILE=/builds/relengapi.tok
|
||||
;;
|
||||
msys)
|
||||
PLATFORM_OS=win
|
||||
TOOLTOOL_AUTH_FILE=c:/builds/relengapi.tok
|
||||
;;
|
||||
*)
|
||||
echo "Unrecognized OSTYPE '$OSTYPE'" >&2
|
||||
|
@ -38,6 +41,13 @@ case "$OSTYPE" in
|
|||
;;
|
||||
esac
|
||||
|
||||
TOOLTOOL_AUTH_FLAGS=
|
||||
|
||||
if [ -e "$TOOLTOOL_AUTH_FILE" ]; then
|
||||
# When the worker has the relengapi token pass it down
|
||||
TOOLTOOL_AUTH_FLAGS="--authentication-file=$TOOLTOOL_AUTH_FILE"
|
||||
fi
|
||||
|
||||
# Install everything needed for the browser on this platform. Not all of it is
|
||||
# necessary for the JS shell, but it's less duplication to share tooltool
|
||||
# manifests.
|
||||
|
@ -46,7 +56,7 @@ BROWSER_PLATFORM=$PLATFORM_OS$BITS
|
|||
: ${TOOLTOOL_CHECKOUT:=$WORK}
|
||||
export TOOLTOOL_CHECKOUT
|
||||
|
||||
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain -v --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST ${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
|
||||
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST ${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
|
||||
|
||||
# Add all the tooltool binaries to our $PATH.
|
||||
for bin in ls $TOOLTOOL_CHECKOUT/*/bin; do
|
||||
|
|
Загрузка…
Ссылка в новой задаче