From 2cc6b46107169f74ec4d0621e576c75f57f6019e Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sun, 23 Sep 2018 13:32:17 +0200
Subject: [PATCH] Simplify the travis script using the Dockerfile

---
 .travis.yml | 45 +++++----------------------------------------
 Dockerfile  |  2 +-
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa0fe00..71c8f40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,52 +1,17 @@
-language: cpp
-os: linux
 sudo: required
-dist: trusty
 branches:
   only:
-  - master
-env:
-  global:
-  - DEVKITPRO=/opt/devkitpro
-  - WUT_ROOT=/opt/devkitpro/wut
-  - DEVKITPPC=/opt/devkitpro/devkitPPC
-  - PORTLIBREPOS=$HOME/portlibrepos
-cache:
-  directories:
-  - "$HOME/.local"
-  - "$DEVKITPRO"
+   - master
+services:
+- docker
 addons:
   apt:
     packages:
     - p7zip-full
-before_install:
-- mkdir -p "${PORTLIBREPOS}"
-- mkdir -p "${DEVKITPRO}"
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb
-  -O /tmp/devkitpro-pacman.deb; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg -i /tmp/devkitpro-pacman.deb;
-  fi
-- yes | sudo dkp-pacman -Syu devkitPPC --needed
-- yes | sudo dkp-pacman -Syu general-tools --needed
-- wget https://github.com/decaf-emu/wut/releases/download/1.0.0-beta2/wut.linux64.7z
-install:
-- 7z x -y $(ls | grep "linux") -o${WUT_ROOT}
-- cd $PORTLIBREPOS
-- git clone https://github.com/Maschell/WiiUPluginSystem.git
-- git clone https://github.com/Maschell/libutils.git -b wut
-- cd WiiUPluginSystem
-- make && make install
-- cd $PORTLIBREPOS
-- cd libutils
-- mkdir build && cd build
-- cmake -DCMAKE_TOOLCHAIN_FILE=$WUT_ROOT/share/wut.toolchain.cmake -DCMAKE_INSTALL_PREFIX=$WUT_ROOT
-  ../
-- make install
-- cd $PORTLIBREPOS
 before_script:
-- cd $TRAVIS_BUILD_DIR/
+- docker build . -t screenstreamer-builder
 script:
-- make -j8
+- docker run -it --rm -v ${PWD}:/project screenstreamer-builder make
 before_deploy:
 - cd $TRAVIS_BUILD_DIR/
 - mkdir -p "wiiu/plugins"
diff --git a/Dockerfile b/Dockerfile
index 486378c..bb39974 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,4 +3,4 @@ FROM wups/core-with-wut:0.1
 # Get dependencies
 COPY --from=wiiuwut/libutils:0.1 /artifacts $WUT_ROOT
 
-WORKDIR project
\ No newline at end of file
+WORKDIR project