diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:14:49 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:14:49 +0200 |
| commit | cdaed8dabfbacd9db74cb302aaaf3efc756f02b8 (patch) | |
| tree | 9907e14040eb17d94530ce2f721ef7b2f6007a0f /build | |
| parent | 2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f (diff) | |
| parent | 047c7375a5fa9f94afb2d490d761fb5ae434988f (diff) | |
| download | forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar.gz forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar.bz2 forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.tar.xz forums-cdaed8dabfbacd9db74cb302aaaf3efc756f02b8.zip | |
Merge pull request #4475 from marc1706/ticket/14805
[ticket/14805] Ignore platform requirements while building packages
* marc1706/ticket/14805:
[ticket/14805] Ignore platform requirements while building packages
[ticket/8301] Add log_time index
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index b732521e3e..100795663b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -49,7 +49,7 @@ --> <target name="composer"> <exec dir="phpBB" - command="php ../composer.phar install" + command="php ../composer.phar install --ignore-platform-reqs" checkreturn="true" passthru="true" /> </target> @@ -270,7 +270,7 @@ command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" checkreturn="true" /> <exec dir="${dir}" - command="php composer.phar install --no-dev --optimize-autoloader" + command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs" checkreturn="true" passthru="true" /> <delete file="${dir}/composer.phar" /> |