jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395913 )
Change subject: HTTPS_PROXY_REQUEST_FULLURI=false for composer ...................................................................... HTTPS_PROXY_REQUEST_FULLURI=false for composer Unclear why this is all of a sudden needed; however, this seems to fix T182266. Found via: https://github.com/composer/composer/issues/1839 Bug: T182266 Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2 --- M jjb/macro.yaml 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: Thcipriani: Looks good to me, approved Gergő Tisza: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/jjb/macro.yaml b/jjb/macro.yaml index cbe79eb..ffb4db0 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -417,10 +417,12 @@ - shell: | #!/bin/bash -eu # Load require-dev packages on top of vendor (T92605, T112895) - set -o pipefail + set -xo pipefail # Set --ignore-platform-reqs to prevent composer from evaluating unrelated dependencies # already present in composer.json (needed for operations/mediawiki-config due to # https://github.com/perftools/xhgui/issues/192). + export HTTP_PROXY_REQUEST_FULLURI=false + export HTTPS_PROXY_REQUEST_FULLURI=false node /srv/deployment/integration/slave-scripts/tools/composer-dev-args.js "$(pwd)/composer.json" | xargs --verbose composer require --dev --ansi --no-progress --ignore-platform-reqs --prefer-dist -v - builder: @@ -567,24 +569,31 @@ name: composer-update builders: - shell: | - set -u + set -ux cd "{dir}" [[ -f "composer.json" ]] || exit 0 + export HTTP_PROXY_REQUEST_FULLURI=false + export HTTPS_PROXY_REQUEST_FULLURI=false composer update --ansi --no-progress --prefer-dist --profile -v - builder: name: composer-install builders: - shell: | - set -u + set -ux cd "{dir}" [[ -f "composer.json" ]] || exit 0 + export HTTP_PROXY_REQUEST_FULLURI=false + export HTTPS_PROXY_REQUEST_FULLURI=false composer install --ansi --no-progress --prefer-dist --profile -v - builder: name: composer-update-no-dev builders: - shell: | + set -x + export HTTP_PROXY_REQUEST_FULLURI=false + export HTTPS_PROXY_REQUEST_FULLURI=false composer update --ansi --no-progress --prefer-dist --profile --no-dev - builder: -- To view, visit https://gerrit.wikimedia.org/r/395913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
