actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 13:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[ubuntu] Rework php installation (#3272)" (#3340)

Browse Source 
This reverts commit b1f202e5f0.
This commit is contained in:
Mikhail Timofeev
2021-05-07 16:35:34 +03:00
committed by GitHub
parent 52d48bcbcd
commit a5ee51f72d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -211,11 +211,10 @@ function Get-SbtVersion {
function Get-PHPVersions { function Get-PHPVersions {
$result = Get-CommandResult "apt list --installed" -Multiline $result = Get-CommandResult "apt list --installed" -Multiline
$aptSourceRepo = Get-AptSourceRepository -PackageName "php" return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object {
$versionsList = $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object {
$_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null
$Matches.version } $Matches.version
return $versionsList + "(apt source repository: $aptSourceRepo)" }
} }
function Get-ComposerVersion { function Get-ComposerVersion {

14
images/linux/scripts/installers/php.sh
View File

@@ -10,8 +10,7 @@ source $HELPER_SCRIPTS/os.sh
source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/install.sh
# add repository # add repository
REPO_URL="ppa:ondrej/php" apt-add-repository ppa:ondrej/php -y
apt-add-repository $REPO_URL -y
apt-get update apt-get update
# Install PHP # Install PHP
@@ -99,10 +98,11 @@ wget -q -O phpunit https://phar.phpunit.de/phpunit-8.phar
chmod +x phpunit chmod +x phpunit
mv phpunit /usr/local/bin/phpunit mv phpunit /usr/local/bin/phpunit
# remove repository after successfull installation # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php
rm -r /etc/apt/sources.list.d/ondrej-ubuntu-php-* # see https://github.com/actions/virtual-environments/issues/1084
if isUbuntu20 ; then
echo "php $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt rm /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list
apt-get update apt-get update
fi
invoke_tests "Common" "PHP" invoke_tests "Common" "PHP"