Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Ubuntu] Remove ppa:ondrej/php for Ubuntu 22.04 #6478

Merged
merged 1 commit into from
Oct 27, 2022
Merged

[Ubuntu] Remove ppa:ondrej/php for Ubuntu 22.04 #6478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions images/linux/scripts/installers/php.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ source $HELPER_SCRIPTS/etc-environment.sh
source $HELPER_SCRIPTS/os.sh
source $HELPER_SCRIPTS/install.sh

# add repository
apt-add-repository ppa:ondrej/php -y
apt-get update
# add repository for old Ubuntu images
# details in thread: https://github.com/actions/runner-images/issues/6331
if isUbuntu18 || isUbuntu20; then
apt-add-repository ppa:ondrej/php -y
apt-get update
fi

# Install PHP
php_versions=$(get_toolset_value '.php.versions[]')
Expand Down Expand Up @@ -103,7 +106,7 @@ mv phpunit /usr/local/bin/phpunit

# ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php
# see https://github.com/actions/runner-images/issues/1084
if isUbuntu20 || isUbuntu22; then
if isUbuntu20; then
rm /etc/apt/sources.list.d/ondrej-*.list
apt-get update
fi
Expand Down