mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1209494: remove refs to RELENGAPI_TOKEN, TOOLTOOL_CACHE; r=jlund
RELENGAPI_TOKEN is no longer needed, with the advent of the relengapi proxy. TOOLTOOL_CACHE has a reasonable default (and why would you want to change that, anyway?)
This commit is contained in:
parent
1b0f8bb45d
commit
d949f0e0df
@ -15,8 +15,6 @@ echo "running as" $(id)
|
||||
|
||||
: TOOLTOOL_CACHE ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
|
||||
|
||||
: RELENGAPI_TOKEN ${RELENGAPI_TOKEN+HIDDEN}
|
||||
|
||||
: NEED_XVFB ${NEED_XVFB:=false}
|
||||
|
||||
: MH_CUSTOM_BUILD_VARIANT_CFG ${MH_CUSTOM_BUILD_VARIANT_CFG}
|
||||
@ -100,17 +98,6 @@ if [ "$CHECKOUT_GAIA" = true ]; then
|
||||
ln -s $gaia_dir $GECKO_DIR/gaia
|
||||
fi
|
||||
|
||||
set +x
|
||||
# mozharness scripts look for the relengapi token at this location, so put it there,
|
||||
# if specified
|
||||
if [ -n "${RELENGAPI_TOKEN}" ]; then
|
||||
echo 'Storing $RELENGAPI_TOKEN in /builds/relengapi.tok'
|
||||
echo ${RELENGAPI_TOKEN} > /builds/relengapi.tok
|
||||
# unset it so that mozharness doesn't "helpfully" log it
|
||||
unset RELENGAPI_TOKEN
|
||||
fi
|
||||
set -x
|
||||
|
||||
# $TOOLTOOL_CACHE bypasses mozharness completely and is read by tooltool_wrapper.sh to set the
|
||||
# cache. However, only some mozharness scripts use tooltool_wrapper.sh, so this may not be
|
||||
# entirely effective.
|
||||
|
@ -41,12 +41,6 @@ task:
|
||||
MH_BRANCH: {{project}}
|
||||
MH_BUILD_POOL: taskcluster
|
||||
|
||||
# image paths
|
||||
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
|
||||
|
||||
# authentication
|
||||
RELENGAPI_TOKEN: 'TODO' # 1164612: encrypt this secret
|
||||
|
||||
maxRunTime: 36000
|
||||
|
||||
command: ["/bin/bash", "bin/build.sh"]
|
||||
|
@ -43,12 +43,6 @@ task:
|
||||
|
||||
CHECKOUT_GAIA: true
|
||||
|
||||
# image paths
|
||||
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
|
||||
|
||||
# authentication
|
||||
RELENGAPI_TOKEN: 'TODO' # 1164612: encrypt this secret
|
||||
|
||||
maxRunTime: 36000
|
||||
|
||||
command: ["/bin/bash", "bin/build.sh"]
|
||||
|
@ -52,12 +52,6 @@ task:
|
||||
PARTNER_HEAD_REV: 756f0378d4cac87e5e6c405249ede5effe082da2
|
||||
PARTNER_DEST_DIR: '/home/worker/workspace/build/partner'
|
||||
|
||||
# image paths
|
||||
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
|
||||
|
||||
# authentication
|
||||
RELENGAPI_TOKEN: 'TODO' # 1164612: encrypt this secret
|
||||
|
||||
maxRunTime: 36000
|
||||
|
||||
command: ["/bin/bash", "bin/build.sh"]
|
||||
|
Loading…
Reference in New Issue
Block a user