Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400002 )
Change subject: Remove php-curl from ci-src-setup and bypass platform-checks in composer ...................................................................... Remove php-curl from ci-src-setup and bypass platform-checks in composer The php-curl extension was added for composer not failing when an extension requires the curl extension and expressed that by adding the ext-curl as a requirement to composer.json. As the actual test run of the extension does not happen in the ci-src-setup container, but rather in another container, which actually need the extensions to be installed (otherwise erros will occur in the tests), remove the extension from here. The extension is not used in any way in this container. Additionally: Run composer install and update with the --ignore-platform-reqs flag, which bypasses any check for platform dependencies like php, hhvm, lib-* and ext-*. Checking them in this container is useless, as the actual test run will happen in another container. Also: If an extension is required for the test run (which is the whole point of all these containers, to run tests), these tests will fail and the extension can be added to the respective container, if needed. Change-Id: I96f9d61404c68a91f0384f05a4407ab5911ff1c4 Task: T183643 --- M dockerfiles/ci-src-setup/Dockerfile.template M dockerfiles/ci-src-setup/setup-mw.sh M dockerfiles/ci-src-setup/setup-mwext.sh 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/02/400002/1 diff --git a/dockerfiles/ci-src-setup/Dockerfile.template b/dockerfiles/ci-src-setup/Dockerfile.template index b1d685e..9fe6530 100644 --- a/dockerfiles/ci-src-setup/Dockerfile.template +++ b/dockerfiles/ci-src-setup/Dockerfile.template @@ -16,8 +16,8 @@ # RUN echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list \ # php7.0-zip needed by composer to install things from dist - # others php packages are needed by mediawiki/libraries - && {{ "php7.0-cli php7.0-curl php7.0-zip php-ast php7.0-mbstring php7.0-xml" | apt_install }} \ + # others php packages are needed by mediawiki + && {{ "php7.0-cli php7.0-zip php-ast php7.0-mbstring php7.0-xml" | apt_install }} \ && apt-get purge --yes apt-transport-https \ && rm /etc/apt/sources.list.d/php.list diff --git a/dockerfiles/ci-src-setup/setup-mw.sh b/dockerfiles/ci-src-setup/setup-mw.sh index 41902c8..9e42af2 100644 --- a/dockerfiles/ci-src-setup/setup-mw.sh +++ b/dockerfiles/ci-src-setup/setup-mw.sh @@ -17,4 +17,4 @@ cd /src [[ -f "composer.json" ]] || exit 0 -composer update --ansi --no-progress --prefer-dist --profile -v +composer update --ansi --no-progress --prefer-dist --profile --ignore-platform-reqs -v diff --git a/dockerfiles/ci-src-setup/setup-mwext.sh b/dockerfiles/ci-src-setup/setup-mwext.sh index 2634b9c..3e21bcb 100644 --- a/dockerfiles/ci-src-setup/setup-mwext.sh +++ b/dockerfiles/ci-src-setup/setup-mwext.sh @@ -38,4 +38,4 @@ composer --ansi validate --no-check-publish /srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py "/tmp/extensions_load.txt" composer.local.json -composer update --ansi --no-progress --prefer-dist --profile --no-dev +composer update --ansi --no-progress --prefer-dist --profile --no-dev --ignore-platform-reqs -- To view, visit https://gerrit.wikimedia.org/r/400002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96f9d61404c68a91f0384f05a4407ab5911ff1c4 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
