Add ubuntu 24.04 --skip-build-php --skip-release

shivammathur · May 17, 2024 · 9041816 · 9041816
1 parent e86f7d9
commit 9041816
Show file tree

Hide file tree

Showing 55 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
         php-versions: ['5.3', '5.4', '5.5']
     steps:
       - name: Checkout

diff --git a/.github/workflows/zstd.yml b/.github/workflows/zstd.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container: [22.04, 20.04, 18.04]
+        container: [24.04, 22.04, 20.04]
     if: "!contains(github.event.head_commit.message, 'skip-build')"
     steps:
       - name: Checkout

diff --git a/deps/22.04/libodbc1_2.3.9-5_amd64.deb b/deps/22.04/libodbc1_2.3.9-5_amd64.deb
diff --git a/deps/22.04/libodbc1_2.3.9-5ubuntu0.1_amd64.deb b/deps/22.04/libodbc1_2.3.9-5ubuntu0.1_amd64.deb
diff --git a/deps/22.04/libodbccr2_2.3.9-5_amd64.deb b/deps/22.04/libodbccr2_2.3.9-5_amd64.deb
diff --git a/deps/22.04/libodbccr2_2.3.9-5ubuntu0.1_amd64.deb b/deps/22.04/libodbccr2_2.3.9-5ubuntu0.1_amd64.deb
diff --git a/deps/24.04/libasn1-8-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libasn1-8-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libdeflate-dev_1.19-1build1_amd64.deb b/deps/24.04/libdeflate-dev_1.19-1build1_amd64.deb
diff --git a/deps/24.04/libdeflate0_1.19-1build1_amd64.deb b/deps/24.04/libdeflate0_1.19-1build1_amd64.deb
diff --git a/deps/24.04/libenchant1c2a_1.6.0-7_amd64.deb b/deps/24.04/libenchant1c2a_1.6.0-7_amd64.deb
diff --git a/deps/24.04/libgssapi3-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libgssapi3-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libhcrypto4-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libhcrypto4-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libheimbase1-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libheimbase1-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libheimntlm0-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libheimntlm0-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libhunspell-1.3-0_1.3.2-4_amd64.deb b/deps/24.04/libhunspell-1.3-0_1.3.2-4_amd64.deb
diff --git a/deps/24.04/libhx509-5-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libhx509-5-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libidn11_1.33-2.2ubuntu2_amd64.deb b/deps/24.04/libidn11_1.33-2.2ubuntu2_amd64.deb
diff --git a/deps/24.04/libjbig-dev_2.1-6ubuntu1_amd64.deb b/deps/24.04/libjbig-dev_2.1-6ubuntu1_amd64.deb
diff --git a/deps/24.04/libjbig0_2.1-6ubuntu1_amd64.deb b/deps/24.04/libjbig0_2.1-6ubuntu1_amd64.deb
diff --git a/deps/24.04/libjpeg-dev_8c-2ubuntu11_amd64.deb b/deps/24.04/libjpeg-dev_8c-2ubuntu11_amd64.deb
diff --git a/deps/24.04/libjpeg-turbo8-dev_2.1.5-2ubuntu2_amd64.deb b/deps/24.04/libjpeg-turbo8-dev_2.1.5-2ubuntu2_amd64.deb
diff --git a/deps/24.04/libjpeg8-dev_8c-2ubuntu11_amd64.deb b/deps/24.04/libjpeg8-dev_8c-2ubuntu11_amd64.deb
diff --git a/deps/24.04/libjpeg8_8c-2ubuntu11_amd64.deb b/deps/24.04/libjpeg8_8c-2ubuntu11_amd64.deb
diff --git a/deps/24.04/libkrb5-26-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libkrb5-26-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libldap-2.4-2_2.4.49+dfsg-2ubuntu1_amd64.deb b/deps/24.04/libldap-2.4-2_2.4.49+dfsg-2ubuntu1_amd64.deb
diff --git a/deps/24.04/liblerc-dev_4.0.0+ds-4ubuntu2_amd64.deb b/deps/24.04/liblerc-dev_4.0.0+ds-4ubuntu2_amd64.deb
diff --git a/deps/24.04/liblerc4_4.0.0+ds-4ubuntu2_amd64.deb b/deps/24.04/liblerc4_4.0.0+ds-4ubuntu2_amd64.deb
diff --git a/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1build1_amd64.deb b/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1build1_amd64.deb
diff --git a/deps/24.04/liblzma5_5.6.1+really5.4.5-1build1_amd64.deb b/deps/24.04/liblzma5_5.6.1+really5.4.5-1build1_amd64.deb
diff --git a/deps/24.04/libmcrypt4_2.5.8-3.4_amd64.deb b/deps/24.04/libmcrypt4_2.5.8-3.4_amd64.deb
diff --git a/deps/24.04/libodbc1_2.3.9-5ubuntu0.1_amd64.deb b/deps/24.04/libodbc1_2.3.9-5ubuntu0.1_amd64.deb
diff --git a/deps/24.04/libodbc2_2.3.9-5ubuntu0.1_amd64.deb b/deps/24.04/libodbc2_2.3.9-5ubuntu0.1_amd64.deb
diff --git a/deps/24.04/libodbccr2_2.3.9-5ubuntu0.1_amd64.deb b/deps/24.04/libodbccr2_2.3.9-5ubuntu0.1_amd64.deb
diff --git a/deps/24.04/libpcre16-3_8.39-15_amd64.deb b/deps/24.04/libpcre16-3_8.39-15_amd64.deb
diff --git a/deps/24.04/libpcre32-3_8.39-15_amd64.deb b/deps/24.04/libpcre32-3_8.39-15_amd64.deb
diff --git a/deps/24.04/libpcre3_8.39-15build1_amd64.deb b/deps/24.04/libpcre3_8.39-15build1_amd64.deb
diff --git a/deps/24.04/libpcrecpp0v5_8.39-15_amd64.deb b/deps/24.04/libpcrecpp0v5_8.39-15_amd64.deb
diff --git a/deps/24.04/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb b/deps/24.04/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb
diff --git a/deps/24.04/libroken18-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libroken18-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/libsharpyuv-dev_1.3.2-0.4build3_amd64.deb b/deps/24.04/libsharpyuv-dev_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libsharpyuv0_1.3.2-0.4build3_amd64.deb b/deps/24.04/libsharpyuv0_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libsqlite3-0_3.45.1-1ubuntu2_amd64.deb b/deps/24.04/libsqlite3-0_3.45.1-1ubuntu2_amd64.deb
diff --git a/deps/24.04/libtiff-dev_4.3.0-6ubuntu0.8_amd64.deb b/deps/24.04/libtiff-dev_4.3.0-6ubuntu0.8_amd64.deb
diff --git a/deps/24.04/libtiff5-dev_4.3.0-6ubuntu0.8_amd64.deb b/deps/24.04/libtiff5-dev_4.3.0-6ubuntu0.8_amd64.deb
diff --git a/deps/24.04/libtiff5_4.3.0-6ubuntu0.8_amd64.deb b/deps/24.04/libtiff5_4.3.0-6ubuntu0.8_amd64.deb
diff --git a/deps/24.04/libtiffxx5_4.3.0-6ubuntu0.8_amd64.deb b/deps/24.04/libtiffxx5_4.3.0-6ubuntu0.8_amd64.deb
diff --git a/deps/24.04/libtinfo5_6.2+20201114-2build1_amd64.deb b/deps/24.04/libtinfo5_6.2+20201114-2build1_amd64.deb
diff --git a/deps/24.04/libwebp-dev_1.3.2-0.4build3_amd64.deb b/deps/24.04/libwebp-dev_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libwebp7_1.3.2-0.4build3_amd64.deb b/deps/24.04/libwebp7_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libwebpdecoder3_1.3.2-0.4build3_amd64.deb b/deps/24.04/libwebpdecoder3_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libwebpdemux2_1.3.2-0.4build3_amd64.deb b/deps/24.04/libwebpdemux2_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libwebpmux3_1.3.2-0.4build3_amd64.deb b/deps/24.04/libwebpmux3_1.3.2-0.4build3_amd64.deb
diff --git a/deps/24.04/libwind0-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb b/deps/24.04/libwind0-heimdal_7.7.0+dfsg-1ubuntu1_amd64.deb
diff --git a/deps/24.04/multiarch-support_2.28-10_amd64 b/deps/24.04/multiarch-support_2.28-10_amd64
diff --git a/scripts/install-php.sh b/scripts/install-php.sh
@@ -2,7 +2,7 @@
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 dpkg_install="sudo $debconf_fix dpkg -i --force-conflicts --force-overwrite"
 sudo mkdir -p /var/run /run/php /usr/local/php /usr/lib/systemd/system /usr/lib/cgi-bin /var/www/html
-[[ "$VERSION_ID" = "20.04" || "$VERSION_ID" = "22.04" ]] && $dpkg_install ./deps/"$VERSION_ID"/multiarch-support_2.28-10_amd64
+[[ "$VERSION_ID" = "20.04" || "$VERSION_ID" = "22.04" || $VERSION_ID = "24.04" ]] && $dpkg_install ./deps/"$VERSION_ID"/multiarch-support_2.28-10_amd64
 $dpkg_install ./deps/"$VERSION_ID"/*.deb
 $dpkg_install ./deps/all/*.deb
 sudo tar -I zstd -xf ./php-@[email protected] -C /usr/local/php