Add support for Ubuntu 22.04

shivammathur · May 5, 2022 · 920ec83 · 920ec83
1 parent 6a6329b
commit 920ec83
Show file tree

Hide file tree

Showing 7 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-20.04, ubuntu-18.04]
+        operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.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: [20.04, 18.04]
+        container: [22.04, 20.04, 18.04]
     if: "!contains(github.event.head_commit.message, 'skip-build')"
     steps:
       - name: Checkout

diff --git a/deps/22.04/libenchant1c2a_1.6.0-7_amd64.deb b/deps/22.04/libenchant1c2a_1.6.0-7_amd64.deb
diff --git a/deps/22.04/libhunspell-1.3-0_1.3.2-4_amd64.deb b/deps/22.04/libhunspell-1.3-0_1.3.2-4_amd64.deb
diff --git a/deps/22.04/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb b/deps/22.04/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb
diff --git a/deps/22.04/multiarch-support_2.28-10_amd64 b/deps/22.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" ] && $dpkg_install ./deps/20.04/multiarch-support_2.28-10_amd64
+[[ "$VERSION_ID" = "20.04" || "$VERSION_ID" = "22.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