diff --git a/images/linux/scripts/helpers/document.sh b/images/linux/scripts/helpers/document.sh index e7311689c..9f6830efa 100644 --- a/images/linux/scripts/helpers/document.sh +++ b/images/linux/scripts/helpers/document.sh @@ -28,3 +28,15 @@ function DocumentInstalledItem { function DocumentInstalledItemIndent { WriteItem " - $1" } + +function AddBlockquote { + WriteItem "> $1" +} + +function StartCode { + WriteItem "``````" +} + +function EndCode { + WriteItem "``````" +} diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index f5f8b9733..0c4bbaabb 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -134,5 +134,17 @@ for version in $php_versions; do DocumentInstalledItem "PHP $version ($(php$version --version | head -n 1))" done +# ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php +# see https://github.com/actions/virtual-environments/issues/1084 +if isUbuntu20 ; then + rm /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list + apt-get update + AddBlockquote "To use ppa:ondrej/php APT repository On Ubuntu 20.04 it is necessary to add it to the APT sources" + StartCode + WriteItem apt-add-repository ppa:ondrej/php -y + WriteItem apt-get update + EndCode +fi + DocumentInstalledItem "Composer ($(composer --version))" DocumentInstalledItem "PHPUnit ($(phpunit --version))"