summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-22 15:54:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-22 15:54:11 (GMT)
commita8c42cf88a44bfe045cbac690885797ddbfbc493 (patch)
tree081edc1e84a4a53f51a3986a41ae0aa5e9adc682 /.travis.yml
parent4239508e7cad292062462aa02508750c0078ef21 (diff)
parent4a021085fc056a549067c6b2370a1910be133fd7 (diff)
downloadtk-a8c42cf88a44bfe045cbac690885797ddbfbc493.zip
tk-a8c42cf88a44bfe045cbac690885797ddbfbc493.tar.gz
tk-a8c42cf88a44bfe045cbac690885797ddbfbc493.tar.bz2
Merge trunk. Add travis build on Ubuntu without libnotify
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index d1f6356..155cd46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,14 @@ addons:
- gcc-mingw-w64-i686
- gcc-mingw-w64-x86-64
- gcc-multilib
- - tcl-dev
+ - tcl8.6-dev
- libx11-dev
+ - libnotify-dev
- xvfb
homebrew:
packages:
- tcl-tk
+ - libnotify
casks:
- xquartz
jobs:
@@ -52,6 +54,16 @@ jobs:
- BUILD_DIR=unix
- CFGOPT="--disable-xft"
script: *x11gui
+ - name: "Linux/GCC/Shared/no-libnotify"
+ os: linux
+ dist: focal
+ services:
+ - xvfb
+ compiler: gcc
+ env:
+ - BUILD_DIR=unix
+ - CFGOPT="--disable-libnotify"
+ script: *x11gui
- name: "Linux/GCC/Shared/bionic"
os: linux
dist: bionic