From 70cd7d9fdfb0ff785f010ff742f56952bd78724d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
Date: Thu, 30 Aug 2018 10:23:30 +0300
Subject: [PATCH] Builder|Homepage|Linux: Ubuntu build server upgraded to
 Bionic

The prebuilt Ubuntu packages on the Autobuilder will henceforth be
built for/on Bionic.

Other Ubuntu versions still available on Launchpad:
https://launchpad.net/~sjke/+archive/ubuntu/doomsday

Disabled Artful since Launchpad no longer accepts packages for it.
---
 distrib/autobuild.py              | 2 +-
 doomsday/cmake/PlatformUnix.cmake | 2 +-
 web2/linux.php                    | 2 +-
 webapi/1/admin/bdb.php            | 1 +
 webapi/1/dump.php                 | 2 +-
 weblib/utils.inc.php              | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/distrib/autobuild.py b/distrib/autobuild.py
index eef064a644..c560f27627 100755
--- a/distrib/autobuild.py
+++ b/distrib/autobuild.py
@@ -210,7 +210,7 @@ def build_source_package():
     # Check distribution.
     system_command("lsb_release -a | perl -n -e 'm/Codename:\s(.+)/ && print $1' > /tmp/distroname")
     hostDistro = file('/tmp/distroname', 'rt').read()
-    distros = ['xenial', 'artful', 'bionic']
+    distros = ['xenial', 'bionic']
 
     for distro in distros:
         os.chdir(os.path.join(builder.config.DISTRIB_DIR))
diff --git a/doomsday/cmake/PlatformUnix.cmake b/doomsday/cmake/PlatformUnix.cmake
index dbe5a12f5e..51870160a0 100644
--- a/doomsday/cmake/PlatformUnix.cmake
+++ b/doomsday/cmake/PlatformUnix.cmake
@@ -33,7 +33,7 @@ else ()
 endif ()
 
 if (CPACK_GENERATOR STREQUAL DEB)
-    add_definitions (-DDENG_PLATFORM_ID="ubuntu16-${DENG_ARCH}")
+    add_definitions (-DDENG_PLATFORM_ID="ubuntu18-${DENG_ARCH}")
 elseif (CPACK_GENERATOR STREQUAL RPM)
     add_definitions (-DDENG_PLATFORM_ID="fedora23-${DENG_ARCH}")
 else ()
diff --git a/web2/linux.php b/web2/linux.php
index 92d62a17d0..c2c114c15c 100644
--- a/web2/linux.php
+++ b/web2/linux.php
@@ -26,7 +26,7 @@
         <h1>Unstable</h1>
         <p>Unstable builds are made automatically every day when changes are committed to the <a href="source">source repository</a>. They contain work-in-progress code and sometimes may crash on you. Change logs can be found in the <a href="/builds">Autobuilder</a>.</p>
         <?php 
-        generate_badges('ubuntu16-x86_64', BT_UNSTABLE);
+        generate_badges('ubuntu18-x86_64', BT_UNSTABLE);
         generate_badges('fedora23-x86_64', BT_UNSTABLE);
         ?>
     </article>
diff --git a/webapi/1/admin/bdb.php b/webapi/1/admin/bdb.php
index 1343e8fe4f..989222eb05 100644
--- a/webapi/1/admin/bdb.php
+++ b/webapi/1/admin/bdb.php
@@ -168,6 +168,7 @@ function purge_old_builds()
         . "(160, 'win-x86', 'Windows 7', 'windows', 'x86', 32), "
         . "(245, 'mac10_10-x86_64', 'macOS 10.10', 'macx', 'x86_64', 64), "
         . "(250, 'mac10_8-x86_64', 'macOS 10.8', 'macx', 'x86_64', 64), "
+        . "(345, 'ubuntu18-x86_64', 'Ubuntu 18.04', 'linux', 'amd64', 64), "
         . "(350, 'ubuntu16-x86_64', 'Ubuntu 16.04', 'linux', 'amd64', 64), "
         . "(355, 'ubuntu14-x86_64', 'Ubuntu 14.04', 'linux', 'amd64', 64), "
         . "(360, 'ubuntu14-i386', 'Ubuntu 14.04', 'linux', 'i386', 32), "
diff --git a/webapi/1/dump.php b/webapi/1/dump.php
index b9f8be6fc0..a89110f408 100644
--- a/webapi/1/dump.php
+++ b/webapi/1/dump.php
@@ -25,7 +25,7 @@
     'win-x64',
     'win-x86',
     'mac10_10-x86_64',
-    'ubuntu16-x86_64',
+    'ubuntu18-x86_64',
     'fedora23-x86_64',
     'source'
 ];
diff --git a/weblib/utils.inc.php b/weblib/utils.inc.php
index 5015fecc0d..95aa888163 100644
--- a/weblib/utils.inc.php
+++ b/weblib/utils.inc.php
@@ -60,7 +60,7 @@ function user_download_platform()
     switch (detect_user_platform()) {
         case 'windows': $dl_plat = 'win-x64';         break;
         case 'macx':    $dl_plat = 'mac10_10-x86_64'; break;
-        case 'linux':   $dl_plat = 'ubuntu16-x86_64'; break;
+        case 'linux':   $dl_plat = 'ubuntu18-x86_64'; break;
         default:        $dl_plat = 'source';          break;
     }
     return $dl_plat;