ervin/comfortable-swipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt fix

Browse Source
This commit is contained in:
Rico Tiongson 2019-03-10 18:41:07 +08:00
parent 528d8513ea
commit 37b8538452
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.travis.yml
View File

@ -1,10 +1,9 @@
dist: xenial
sudo: required sudo: required
language: c++
matrix: matrix:
include: include:
<<<<<<< HEAD - dist: xenial
- env: {MATRIX_EVAL: "CC=gcc-7 && CXX=g++-7"} language: c++
env: {MATRIX_EVAL: "CC=gcc-7 && CXX=g++-7"}
addons: addons:
apt: apt:
update: true update: true
@ -14,7 +13,9 @@ matrix:
- libxdo-dev - libxdo-dev
- libinput-tools - libinput-tools
- g++-7 - g++-7
- env: {MATRIX_EVAL: "CC=gcc-8 && CXX=g++-8"} - dist: xenial
language: c++
env: {MATRIX_EVAL: "CC=gcc-8 && CXX=g++-8"}
addons: addons:
apt: apt:
update: true update: true
@ -24,20 +25,6 @@ matrix:
- libxdo-dev - libxdo-dev
- libinput-tools - libinput-tools
- g++-8 - g++-8
=======
- addons: {apt: {packages: ["g++-8"]}}
env: {MATRIX_EVAL: "CC=gcc-7 && CXX=g++-7"}
- addons: {apt: {packages: ["g++-8"]}}
env: {MATRIX_EVAL: "CC=gcc-8 && CXX=g++-8"}
addons:
apt:
update: true
sources:
- ubuntu-toolchain-r-test
packages:
- libxdo-dev
- libinput-tools
>>>>>>> 535e1faf70916061ccf1d692fd6b747873538415
before_install: eval "${MATRIX_EVAL}" before_install: eval "${MATRIX_EVAL}"
install: bash install install: bash install
script: ./tests/run_tests script: ./tests/run_tests