From 7295cf0577536fbd31d852187fcb6a823bedc961 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 6 Sep 2018 13:56:20 -0700 Subject: [PATCH] Fix Travis sorting so 11 comes first --- .travis.yml | 12 ++++++------ update.sh | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9bff0826dc..8b45244dfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ language: bash services: docker env: + - VERSION=11 + - VERSION=11 FORCE_DEB_BUILD=1 + - VERSION=11 VARIANT=alpine + - VERSION=10 + - VERSION=10 FORCE_DEB_BUILD=1 + - VERSION=10 VARIANT=alpine - VERSION=9.6 - VERSION=9.6 FORCE_DEB_BUILD=1 - VERSION=9.6 VARIANT=alpine @@ -14,12 +20,6 @@ env: - VERSION=9.3 - VERSION=9.3 FORCE_DEB_BUILD=1 - VERSION=9.3 VARIANT=alpine - - VERSION=11 - - VERSION=11 FORCE_DEB_BUILD=1 - - VERSION=11 VARIANT=alpine - - VERSION=10 - - VERSION=10 FORCE_DEB_BUILD=1 - - VERSION=10 VARIANT=alpine install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/update.sh b/update.sh index 7d5b8c39fb..e605f852d7 100755 --- a/update.sh +++ b/update.sh @@ -9,6 +9,9 @@ if [ ${#versions[@]} -eq 0 ]; then fi versions=( "${versions[@]%/}" ) +# sort version numbers with highest last (so it goes first in .travis.yml) +IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -V) ); unset IFS + defaultDebianSuite='stretch-slim' declare -A debianSuite=( #[9.6]='jessie'