diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:14:52 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:14:52 +0200 |
| commit | 78333e300cc4a22c0211029d3490ff4c50b16294 (patch) | |
| tree | eb7dd4cc0a3a6c2c968970921b23f58c402f4377 /build | |
| parent | 328a7afcc3307f4c53bceb3ce733c832b503aafb (diff) | |
| parent | 165e0edb2a41801a278ab00673f730e33192615a (diff) | |
| download | forums-78333e300cc4a22c0211029d3490ff4c50b16294.tar forums-78333e300cc4a22c0211029d3490ff4c50b16294.tar.gz forums-78333e300cc4a22c0211029d3490ff4c50b16294.tar.bz2 forums-78333e300cc4a22c0211029d3490ff4c50b16294.tar.xz forums-78333e300cc4a22c0211029d3490ff4c50b16294.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14805] Ignore platform requirements while building packages
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 061b3c7791..84ff43415f 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> @@ -267,7 +267,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" /> |