Fix composer and extension versions
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Cassowary 2023-01-17 19:26:05 -08:00
parent c377ae6620
commit bde470d4f9
2 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
export LOCAL_SETTINGS_CONF_VERSION=v2 export LOCAL_SETTINGS_CONF_VERSION=v2
export HTACCESS_CONF_VERSION=v1 export HTACCESS_CONF_VERSION=v1
export ENTRYPOINT_CONF_VERSION=v2 export ENTRYPOINT_CONF_VERSION=v3
export COMPOSER_LOCAL_CONF_VERSION=v1 export COMPOSER_LOCAL_CONF_VERSION=v1
export PHP_INI_VERSION=v1 export PHP_INI_VERSION=v1

View File

@ -8,7 +8,7 @@ init_composer() {
if ! type composer > /dev/null 2>&1; then if ! type composer > /dev/null 2>&1; then
apt update -yqq && apt install -yqq curl git unzip zip apt update -yqq && apt install -yqq curl git unzip zip
curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.15 php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.5.1
composer -V composer -V
fi fi
} }
@ -51,14 +51,14 @@ init_db() {
init_extensions() { init_extensions() {
if [ ! -d /var/www/html/extensions/PluggableAuth ]; then if [ ! -d /var/www/html/extensions/PluggableAuth ]; then
git clone --depth 1 -b REL1_32 \ git clone --depth 1 -b REL1_39 \
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PluggableAuth \ https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PluggableAuth \
/var/www/html/extensions/PluggableAuth /var/www/html/extensions/PluggableAuth
fi fi
if [ -n "${SAML_ENABLED-}" ]; then if [ -n "${SAML_ENABLED-}" ]; then
if [ ! -d /var/www/html/extensions/SimpleSAMLphp ]; then if [ ! -d /var/www/html/extensions/SimpleSAMLphp ]; then
git clone --depth 1 -b REL1_32 \ git clone --depth 1 -b REL1_39 \
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SimpleSAMLphp \ https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SimpleSAMLphp \
/var/www/html/extensions/SimpleSAMLphp /var/www/html/extensions/SimpleSAMLphp
fi fi
@ -66,7 +66,7 @@ init_extensions() {
if [ -n "${OPENID_ENABLED-}" ]; then if [ -n "${OPENID_ENABLED-}" ]; then
if [ ! -d /var/www/html/extensions/OpenIDConnect ]; then if [ ! -d /var/www/html/extensions/OpenIDConnect ]; then
git clone --depth 1 -b REL1_35 \ git clone --depth 1 -b REL1_39 \
https://gerrit.wikimedia.org/r/mediawiki/extensions/OpenIDConnect \ https://gerrit.wikimedia.org/r/mediawiki/extensions/OpenIDConnect \
/var/www/html/extensions/OpenIDConnect /var/www/html/extensions/OpenIDConnect
fi fi