diff --git a/.github/workflows/production-suite.yml b/.github/workflows/production-suite.yml index 68d3ccd469..106a318029 100644 --- a/.github/workflows/production-suite.yml +++ b/.github/workflows/production-suite.yml @@ -114,6 +114,11 @@ jobs: os: focal extra_args: "" + - docker_image: zulip/ci:jammy + name: Ubuntu 22.04 production install + os: jammy + extra_args: "" + - docker_image: zulip/ci:buster name: Debian 10 production install with custom db name and user os: buster diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml index fd71a4e860..c4543171cd 100644 --- a/.github/workflows/zulip-ci.yml +++ b/.github/workflows/zulip-ci.yml @@ -27,13 +27,16 @@ jobs: - docker_image: zulip/ci:focal name: Ubuntu 20.04 Focal (Python 3.8, backend) os: focal - is_focal: true include_frontend_tests: false # Debian 11 ships with Python 3.9.2. - docker_image: zulip/ci:bullseye name: Debian 11 Bullseye (Python 3.9, backend) os: bullseye - is_bullseye: true + include_frontend_tests: false + # Ubuntu 22.04 ships with Python 3.9.10. + - docker_image: zulip/ci:jammy + name: Ubuntu 22.04 Jammy (Python 3.9, backend) + os: jammy include_frontend_tests: false runs-on: ubuntu-latest @@ -218,7 +221,7 @@ jobs: retention-days: 60 - name: Check development database build - if: ${{ matrix.is_focal || matrix.is_bullseye }} + if: ${{ matrix.os == 'focal' || matrix.os == 'bullseye' || matrix.os == 'jammy' }} run: ./tools/ci/setup-backend - name: Report status diff --git a/docs/development/setup-advanced.md b/docs/development/setup-advanced.md index 4dcd199e25..5eddc9435e 100644 --- a/docs/development/setup-advanced.md +++ b/docs/development/setup-advanced.md @@ -12,7 +12,7 @@ Contents: If you'd like to install a Zulip development environment on a computer that's running one of: -- Ubuntu 20.04 Focal +- Ubuntu 20.04 Focal, 22.04 Jammy (beta) - Debian 10 Buster, 11 Bullseye - CentOS 7 (beta) - Fedora 33 and 34 (beta) diff --git a/docs/development/setup-vagrant.md b/docs/development/setup-vagrant.md index 9ab3f0a0d7..748cdd38dc 100644 --- a/docs/development/setup-vagrant.md +++ b/docs/development/setup-vagrant.md @@ -49,7 +49,7 @@ a proxy to access the internet.) - **All**: 2GB available RAM, Active broadband internet connection, [GitHub account][set-up-git]. - **macOS**: macOS (10.11 El Capitan or newer recommended) -- **Ubuntu LTS**: 20.04 +- **Ubuntu LTS**: 20.04 or 22.04 - or **Debian**: 10 "buster" or 11 "bullseye" - **Windows**: Windows 64-bit (Win 10 recommended), hardware virtualization enabled (VT-x or AMD-V), administrator access. diff --git a/docs/production/requirements.md b/docs/production/requirements.md index feecff1dc0..2f064751dd 100644 --- a/docs/production/requirements.md +++ b/docs/production/requirements.md @@ -5,6 +5,7 @@ To run a Zulip server, you will need: - A dedicated machine or VM - A supported OS: - Ubuntu 20.04 Focal + - Ubuntu 22.04 Jammy - Debian 11 Bullseye - Debian 10 Buster - At least 2GB RAM, and 10GB disk space @@ -33,7 +34,7 @@ on issues you'll encounter](install-existing-server.md). #### Operating system -Ubuntu 20.04 Focal, Debian 11 Bullseye, and Debian 10 +Ubuntu 20.04 Focal, Ubuntu 22.04 Jammy, Debian 11 Bullseye, and Debian 10 Buster are supported for running Zulip in production. You can also run Zulip on other platforms that support Docker using [docker-zulip][docker-zulip-homepage]. diff --git a/scripts/lib/install b/scripts/lib/install index e8ebf79360..7135816edb 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -211,8 +211,8 @@ if [ -f /etc/os-release ]; then esac fi -case "$os_id$os_version_id" in - debian10 | debian11 | ubuntu20.04) ;; +case "$os_id $os_version_id" in + 'debian 10' | 'debian 11' | 'ubuntu 20.04' | 'ubuntu 22.04') ;; *) set +x cat <