Skip to content

Commit

Permalink
WIP travis
Browse files Browse the repository at this point in the history
  • Loading branch information
dvorka committed Apr 26, 2018
1 parent ecc909a commit f311f6e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
os:
- linux

# solution to missing codecvt: upgrade from g++ 4.8 to 6 and unlink
# solution to missing codecvt: upgrade from g++ 4.8 to 5 and unlink
matrix:
include:
- os: linux
Expand All @@ -10,14 +10,9 @@ matrix:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
- g++-5
env:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
script:
- sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-6 /usr/bin/gcc
- sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-6 /usr/bin/g++
- echo "Upgraded g++"
- g++ --version
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"

language: cpp # see https://docs.travis-ci.com/user/languages/cpp/
compiler:
Expand All @@ -38,6 +33,9 @@ install:
- sudo apt-get install -qq ccache
script:
- cd deps/discount && ./configure.sh && make ; cd ../..
- echo "g++ version" # debug
- g++ --version # debug
- ls /usr/include/c++/5 # debug
- qmake mindforger.pro
- make
- make check
Expand Down
2 changes: 1 addition & 1 deletion mindforger.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.0.1, 2018-04-26T16:16:47. -->
<!-- Written by QtCreator 3.0.1, 2018-04-26T18:10:08. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
Expand Down

0 comments on commit f311f6e

Please sign in to comment.