Removes Debian 9.9 and Ubuntu 16.04.

Fixes issue #141.
tgockel · Feb 19, 2020 · b870325 · b870325
1 parent 5a34350
commit b870325
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,12 @@ dist: xenial
 sudo: required
 env:
   matrix:
-  - DISTRO=ubuntu-16.04  CONF=Debug
-  - DISTRO=ubuntu-16.04  CONF=Release
   - DISTRO=ubuntu-18.04  CONF=Debug
   - DISTRO=ubuntu-18.04  CONF=Release
   - DISTRO=ubuntu-19.10  CONF=Debug
   - DISTRO=ubuntu-19.10  CONF=Release
-  - DISTRO=debian-9.9    CONF=Debug
-  - DISTRO=debian-9.9    CONF=Release
+  - DISTRO=ubuntu-20.04  CONF=Debug
+  - DISTRO=ubuntu-20.04  CONF=Release
   - DISTRO=debian-10.1   CONF=Debug
   - DISTRO=debian-10.1   CONF=Release
   - DISTRO=debian-10.2   CONF=Debug

diff --git a/config/docker/debian-9.9/Dockerfile b/config/docker/debian-9.9/Dockerfile
diff --git a/config/docker/ubuntu-16.04/Dockerfile → config/docker/ubuntu-20.04/Dockerfile b/config/docker/ubuntu-16.04/Dockerfile → config/docker/ubuntu-20.04/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 LABEL maintainer="Travis Gockel <[email protected]>"
 
 RUN apt-get update          \

diff --git a/config/make-packages b/config/make-packages
@@ -37,6 +37,10 @@ while [[ $# -gt 0 ]]; do
       COPY_TO="${key/--copy-to=/}"
       shift
       ;;
+    --help)
+      show_usage
+      exit 1
+      ;;
     --)
       # No shift: want to use the -- in the call
       break
@@ -57,7 +61,7 @@ if [[ ${ALL} -eq 1 ]]; then
   fi
 
   # All distros with working package systems.
-  DISTROS=(debian-9.9 ubuntu-14.04 ubuntu-16.04 ubuntu-18.04 ubuntu-18.10 ubuntu-19.04)
+  DISTROS=(debian-10.1 debian-10.2 ubuntu-18.04 ubuntu-19.10 ubuntu-20.04)
 fi
 
 if [[ -n "${COPY_TO}" ]]; then