mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2025-04-04 00:17:06 +00:00
Patch upstream to install php-xml instead of php-xsl
This commit is contained in:
parent
2a9fcd7101
commit
0c2c76a6dc
1
.github/workflows/commit-tests.yml
vendored
1
.github/workflows/commit-tests.yml
vendored
@ -31,7 +31,6 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: sudo update-alternatives --set php /usr/bin/php7.2
|
||||
- run: sudo apt-get install -y php-xml
|
||||
- name: setup
|
||||
run: sudo -E tests/system-setup/upgrade-from-upstream.sh basic totpuser
|
||||
- name: test-runner
|
||||
|
@ -78,6 +78,16 @@ upstream_install() {
|
||||
sed -i 's|\(.*include:.*zones\.conf.*\)|cat >> /etc/nsd/nsd.conf <<EOF\n do-ip4: yes\n do-ip6: no\nremote-control:\n control-enable: no\nEOF\n\n\1|' setup/dns.sh \
|
||||
|| die "Couldn't patch setup/dns.sh !!"
|
||||
fi
|
||||
|
||||
if [ ! -z "$PHP_XSL_PACKAGE" ]; then
|
||||
# For Github Actions - github's ubuntu 18 includes multiple
|
||||
# PHP versions pre-installed and the php-xsl package for these
|
||||
# versions is a virtual package of package php-xml. To handle
|
||||
# this, change the setup scripts so that $PHP_XSL_PACKAGE
|
||||
# (php-xml) is installed instead of php-xsl.
|
||||
H2 "Patching upstream setup/zpush.sh to install $PHP_XSL_PACKAGE instead of php-xsl"
|
||||
sed -i "s/php-xsl/$PHP_XSL_PACKAGE/g" setup/zpush.sh
|
||||
fi
|
||||
|
||||
H2 "Run upstream setup"
|
||||
if ! setup/start.sh; then
|
||||
|
Loading…
Reference in New Issue
Block a user