commit ae574f71
Added compiling using Docker
Changed files
| M | .travis.yml before |
| M | travis_build.script before |
diff --git a/.travis.yml b/.travis.yml
index f591d43..f6bcbc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,30 +2,9 @@ sudo: required
language: cpp
-addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- - boost-latest
- packages:
- - g++-4.9
- - build-essential
- - libenet-dev
- - libphysfs-dev
- - libboost1.55-dev
- - libjsoncpp-dev
- - cmake
+services:
+ - docker
-cache:
- apt: true
-
-before_install:
- - sudo apt-add-repository --yes ppa:zoogie/sdl2-snapshots
- - sudo apt-get update -qq
- - sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libboost-program-options-dev
-
-install:
- - export CXX="g++-4.9"
script: ./travis_build.script
diff --git a/travis_build.script b/travis_build.script
index 37d83d4..494b1aa 100755
--- a/travis_build.script
+++ b/travis_build.script
@@ -4,12 +4,5 @@ set -e
# First check for formatting errors
bash source/misc/lint/runLint.sh
-# Travis runs Ubuntu 12.04 and misses libutfcpp-dev.
-cp source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/
-cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/
-cmake .
-make
-make clean
-./packdata.sh
-#i686-pc-mingw32-c++ -c -std=c++11 source/code/os.cpp -o windows_os_test.o
-
+docker build -f source/misc/docker/Dockerfile.Ubuntu14.04build . -t blockattack_test
+docker build -f source/misc/docker/Dockerfile.WindoesBuild . -t blockattack_test