# HG changeset patch # User wenzelm # Date 1617655601 -7200 # Node ID e7fb17bca374e079266cd767cfcefb115011b529 # Parent 543d5539306d548ddeb9463d375306398f7fa807 discontinue old Ubuntu 18.04 LTS, e.g. it cannot build documentation "prog-prove"; diff -r 543d5539306d -r e7fb17bca374 Admin/cronjob/README --- a/Admin/cronjob/README Mon Apr 05 22:45:01 2021 +0200 +++ b/Admin/cronjob/README Mon Apr 05 22:46:41 2021 +0200 @@ -21,7 +21,7 @@ Build Log Database Server ========================= -- Ubuntu 18.04 LTS Linux Server standard installation +- Ubuntu 20.04 LTS Linux Server standard installation https://help.ubuntu.com/lts/serverguide - apt install unattended-upgrades diff -r 543d5539306d -r e7fb17bca374 src/Doc/System/Misc.thy --- a/src/Doc/System/Misc.thy Mon Apr 05 22:45:01 2021 +0200 +++ b/src/Doc/System/Misc.thy Mon Apr 05 22:46:41 2021 +0200 @@ -77,7 +77,7 @@ of \<^verbatim>\apt-get install\ within the underlying Linux distribution. Option \<^verbatim>\-P\ refers to high-level package collections: \<^verbatim>\X11\ or \<^verbatim>\latex\ as - provided by \<^verbatim>\isabelle build_docker\ (assuming Ubuntu 18.04 LTS). This + provided by \<^verbatim>\isabelle build_docker\ (assuming Ubuntu 20.04 LTS). This imposes extra weight on the resulting Docker images. Note that \<^verbatim>\X11\ will only provide remote X11 support according to the modest GUI quality standards of the late 1990-ies. diff -r 543d5539306d -r e7fb17bca374 src/Doc/System/Phabricator.thy --- a/src/Doc/System/Phabricator.thy Mon Apr 05 22:45:01 2021 +0200 +++ b/src/Doc/System/Phabricator.thy Mon Apr 05 22:46:41 2021 +0200 @@ -63,7 +63,7 @@ section \Quick start\ text \ - The starting point is a fresh installation of \<^bold>\Ubuntu 18.04 or 20.04 + The starting point is a fresh installation of \<^bold>\Ubuntu 20.04 LTS\\<^footnote>\\<^url>\https://ubuntu.com/download\\: this version is mandatory due to subtle dependencies on system packages and configuration that is assumed by the Isabelle setup tool. @@ -233,7 +233,7 @@ @{verbatim [display] \ systemctl reload apache2\} \<^item> Install \<^verbatim>\certbot\ from \<^url>\https://certbot.eff.org\ following the - description for Apache and Ubuntu 18.04 or 20.04 on + description for Apache and Ubuntu 20.04 on \<^url>\https://certbot.eff.org/lets-encrypt/ubuntubionic-apache\. Run \<^verbatim>\certbot\ interactively and let it operate on the domain \<^verbatim>\vcs.example.org\. @@ -390,7 +390,7 @@ text \ The @{tool_def phabricator_setup} tool installs a fresh Phabricator instance - on Ubuntu 18.04 or 20.04 LTS: + on Ubuntu 20.04 LTS: @{verbatim [display] \Usage: isabelle phabricator_setup [OPTIONS] Options are: @@ -428,9 +428,9 @@ Option \<^verbatim>\-M:\ installs a standard Mercurial release from source --- the one that is used by the Phabricator hosting service \<^url>\https://admin.phacility.com\. This avoids various problems with the - package provided by Ubuntu 18.04 or 20.04. Alternatively, an explicit file - path or URL the source archive (\<^verbatim>\.tar.gz\) may be given here. This option - is recommended for production use, but it requires to \<^emph>\uninstall\ existing + package provided by Ubuntu 20.04. Alternatively, an explicit file path or + URL the source archive (\<^verbatim>\.tar.gz\) may be given here. This option is + recommended for production use, but it requires to \<^emph>\uninstall\ existing Mercurial packages provided by the operating system. Option \<^verbatim>\-n\ provides an alternative installation name. The default name diff -r 543d5539306d -r e7fb17bca374 src/Pure/System/linux.scala --- a/src/Pure/System/linux.scala Mon Apr 05 22:45:01 2021 +0200 +++ b/src/Pure/System/linux.scala Mon Apr 05 22:46:41 2021 +0200 @@ -45,7 +45,6 @@ override def toString: String = description def is_ubuntu: Boolean = id == "Ubuntu" - def is_ubuntu_18_04: Boolean = is_ubuntu && release == "18.04" def is_ubuntu_20_04: Boolean = is_ubuntu && release == "20.04" } diff -r 543d5539306d -r e7fb17bca374 src/Pure/Tools/phabricator.scala --- a/src/Pure/Tools/phabricator.scala Mon Apr 05 22:45:01 2021 +0200 +++ b/src/Pure/Tools/phabricator.scala Mon Apr 05 22:46:41 2021 +0200 @@ -21,31 +21,22 @@ /* required packages */ - val packages_ubuntu_18_04: List[String] = + val packages_ubuntu_20_04: List[String] = Build_Docker.packages ::: List( // https://secure.phabricator.com/source/phabricator/browse/master/scripts/install/install_ubuntu.sh 15e6e2adea61 "git", "mysql-server", "apache2", "libapache2-mod-php", "php", "php-mysql", "php-gd", "php-curl", "php-apcu", "php-cli", "php-json", "php-mbstring", // more packages - "php-xml", "php-zip", "python-pygments", "ssh", "subversion", "python-pygments", + "php-xml", "php-zip", "python3-pygments", "ssh", "subversion", "python-pygments", // mercurial build packages - "make", "gcc", "python", "python-dev", "python-docutils", "python-openssl") - - val packages_ubuntu_20_04: List[String] = - packages_ubuntu_18_04.map( - { - case "python-pygments" => "python3-pygments" - case "python-dev" => "python2-dev" - case name => name - }) + "make", "gcc", "python", "python2-dev", "python-docutils", "python-openssl") def packages: List[String] = { val release = Linux.Release() - if (release.is_ubuntu_18_04) packages_ubuntu_18_04 - else if (release.is_ubuntu_20_04) packages_ubuntu_20_04 - else error("Bad Linux version: expected Ubuntu 18.04 or 20.04 LTS") + if (release.is_ubuntu_20_04) packages_ubuntu_20_04 + else error("Bad Linux version: expected Ubuntu 20.04 LTS") }