Give 1.14 its own docker image.

wesnoth · Mar 30, 2018 · ae332bf · ae332bf
1 parent cfceec1
commit ae332bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,22 +12,22 @@ cache:
 matrix:
   include:
     - compiler: clang
-      env: TOOL=scons CXXSTD=11 NLS=true LTS=1604 BRANCH=master
+      env: TOOL=scons CXXSTD=11 NLS=true LTS=1604 BRANCH=1.14
 
     - compiler: gcc
-      env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master
+      env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=1.14
 
     - compiler: gcc
-      env: TOOL=scons CXXSTD=11 NLS=false LTS=1604 BRANCH=master OPT=-O0
+      env: TOOL=scons CXXSTD=11 NLS=false LTS=1604 BRANCH=1.14 OPT=-O0
 
     - compiler: gcc
-      env: TOOL=cmake CXXSTD=11 NLS=false LTS=1604 BRANCH=master
+      env: TOOL=cmake CXXSTD=11 NLS=false LTS=1604 BRANCH=1.14
 
     - compiler: clang
-      env: TOOL=scons CXXSTD=11 NLS=false LTS=1604 BRANCH=master OPT=-O0
+      env: TOOL=scons CXXSTD=11 NLS=false LTS=1604 BRANCH=1.14 OPT=-O0
 
     - compiler: clang
-      env: TOOL=cmake CXXSTD=11 NLS=false LTS=1604 BRANCH=master
+      env: TOOL=cmake CXXSTD=11 NLS=false LTS=1604 BRANCH=1.14
 
     - os: osx
       compiler: clang

diff --git a/docker/Dockerfile-base-1604-master → docker/Dockerfile-base-1604-1.14 b/docker/Dockerfile-base-1604-master → docker/Dockerfile-base-1604-1.14
diff --git a/docker/Dockerfile-travis-1604-master → docker/Dockerfile-travis-1604-1.14 b/docker/Dockerfile-travis-1604-master → docker/Dockerfile-travis-1604-1.14
@@ -1,4 +1,4 @@
-FROM wesnoth/wesnoth:1604-master
+FROM wesnoth/wesnoth:1604-1.14
 
 COPY ./ /home/wesnoth-travis/