diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d5ac889e..0fd1cfcc 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, ubuntu-20.04, windows-2022, windows-2019] + os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2022, windows-2019] php: ['5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '7.2.11', '7.2.12', '8.1.9', '8.2', '8.3'] exclude: - os: windows-2019 @@ -51,6 +51,10 @@ jobs: php: 7.2.11 - os: ubuntu-22.04 php: 7.2.12 + - os: ubuntu-24.04 + php: 7.2.11 + - os: ubuntu-24.04 + php: 7.2.12 steps: - name: Checkout diff --git a/lib/apt-install-php-ubuntu.sh b/lib/apt-install-php-ubuntu.sh index ae2b5b9f..f5b77f2e 100755 --- a/lib/apt-install-php-ubuntu.sh +++ b/lib/apt-install-php-ubuntu.sh @@ -20,6 +20,7 @@ fi if [[ $version = '5.6' ]] \ || [[ `echo "$version >= 8.2" | bc` == 1 ]] \ + || [[ $release = 'noble' && `echo "$version < 8.1" | bc` == 1 ]] \ || [[ $release = 'jammy' && `echo "$version < 8.1" | bc` == 1 ]] \ || [[ $release = 'focal' && `echo "$version < 7.4 || $version >= 8.0" | bc` == 1 ]] \ || [[ $release = 'bionic' && `echo "$version < 7.4 || $version >= 8.0" | bc` == 1 ]] diff --git a/lib/phpenv-install-php-ubuntu.sh b/lib/phpenv-install-php-ubuntu.sh index 11d1303c..3441e70a 100755 --- a/lib/phpenv-install-php-ubuntu.sh +++ b/lib/phpenv-install-php-ubuntu.sh @@ -51,17 +51,17 @@ fi sudo apt-fast update # sudo apt-get purge 'php*' -sudo apt-fast install -y libcurl4-nss-dev libjpeg-dev re2c libxml2-dev \ +sudo apt-fast install -y libjpeg-dev re2c libxml2-dev \ libtidy-dev libxslt1-dev libmcrypt-dev libreadline-dev libfreetype6-dev \ libonig-dev zlib1g-dev if [ $release == 'bionic' ] then - sudo apt-fast install -y mysql-client + sudo apt-fast install -y mysql-client libcurl4-nss-dev fi if [ $release == 'focal' ] || [ $release == 'jammy' ] then - sudo apt-fast install -y libzip-dev libmariadb-dev libfreetype-dev + sudo apt-fast install -y libzip-dev libmariadb-dev libfreetype-dev libcurl4-nss-dev fi sudo ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl