0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give 1.14 its own docker image.

Browse source
This commit is contained in:
pentarctagon 2018-03-30 08:57:18 -05:00 • committed by Pentarctagon
parent cfceec1d58
commit ae332bf8b1
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.yml
View file

@ -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

0
docker/Dockerfile-base-1604-master → docker/Dockerfile-base-1604-1.14
View file

2
docker/Dockerfile-travis-1604-master → docker/Dockerfile-travis-1604-1.14
View file

@ -1,4 +1,4 @@
FROM wesnoth/wesnoth:1604-master
FROM wesnoth/wesnoth:1604-1.14
COPY ./ /home/wesnoth-travis/