diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d9be7f7c..5ac56b3d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -35,8 +35,6 @@ jobs: php: 7.4.12 - os: windows-2016 php: 8.0 - - os: ubuntu-18.04 - php: 8.0 - os: ubuntu-18.04 php: 7.2.12 - os: ubuntu-18.04 diff --git a/lib/apt-install-php-ubuntu.sh b/lib/apt-install-php-ubuntu.sh index be9744a7..655066fa 100755 --- a/lib/apt-install-php-ubuntu.sh +++ b/lib/apt-install-php-ubuntu.sh @@ -13,7 +13,7 @@ fi sudo apt-get update -if [[ $version = '5.6' ]] || [[ $release = 'focal' && `echo "$version < 7.4 || $version >= 8.0" | bc` == 1 ]] +if [[ $version = '5.6' ]] || [[ `echo "$version < 7.4 || $version >= 8.0" | bc` == 1 ]] then sudo add-apt-repository ppa:ondrej/php sudo apt-fast install -y build-essential debconf-utils unzip autogen autoconf libtool pkg-config