Permalink
Browse files

Merge `builder` into master

  • Loading branch information...
MattRyder committed Jul 23, 2018
1 parent 17c1386 commit 5f99ac0b58be1582026cbe9f9576debe80d5311c
Showing with 14 additions and 3 deletions.
  1. +3 −2 .travis.yml
  2. +11 −1 travis-install.sh
@@ -7,6 +7,7 @@ addons:
sources:
- ubuntu-toolchain-r-test # gcc-8
packages:
- p7zip-full
- g++-8
- gcc-8
- xorg-dev
@@ -19,6 +20,6 @@ install:
script:
- mkdir build
- cd build
- cmake .. -DBUILD_TESTS=ON -DBUILD_EDITOR=OFF -DCMAKE_TOOLCHAIN_FILE=/home/travis/vcpkg/scripts/buildsystems/vcpkg.cmake
- cmake .. -DBUILD_TESTS=ON -DBUILD_EDITOR=OFF -DCMAKE_TOOLCHAIN_FILE=/home/travis/gibengine-vcpkg/scripts/buildsystems/vcpkg.cmake
- make
- ./Tests/GibTest
- ./Tests/GibTest
@@ -22,6 +22,14 @@ function installVcpkg() {
./vcpkg integrate install
}

##
# Grabs the prebuilt linux dep-bins
function grabVcpkgExport() {
cd $HOME
wget http://s3.gibengine.xyz/gibengine-ci/vcpkg/x64-linux/gibengine-vcpkg.7z
7z x gibengine-vcpkg.7z
}

##
# Installs the latest compatible version of Cmake
function installCmake() {
@@ -36,7 +44,9 @@ function install() {

installCmake

installVcpkg
# installVcpkg

grabVcpkgExport
}

install

0 comments on commit 5f99ac0

Please sign in to comment.