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 | 165e0edb2a41801a278ab00673f730e33192615a (patch) | |
| tree | 36868742970042f7ec1f1489feb7471e2324e34f /build | |
| parent | 5a6933fee7d50c58b739c786bc4c01b61af5ebce (diff) | |
| parent | cdaed8dabfbacd9db74cb302aaaf3efc756f02b8 (diff) | |
| download | forums-165e0edb2a41801a278ab00673f730e33192615a.tar forums-165e0edb2a41801a278ab00673f730e33192615a.tar.gz forums-165e0edb2a41801a278ab00673f730e33192615a.tar.bz2 forums-165e0edb2a41801a278ab00673f730e33192615a.tar.xz forums-165e0edb2a41801a278ab00673f730e33192615a.zip | |
Merge branch 'prep-release-3.1.10' into 3.1.x
* prep-release-3.1.10:
[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 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" /> |