diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-28 15:39:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-28 15:39:41 (GMT) |
| commit | 51e8e55cf0e7c6b845a26e90f1ec563a14b60ff6 (patch) | |
| tree | 6409dd4afb77209aff8096fabf7c16a389a2cb5b /.travis.yml | |
| parent | 5d193e26449b56e8301cd9808048b098bdcea79d (diff) | |
| parent | e94dfdbd4228849b456eb14669e58b31f9cb9e62 (diff) | |
| download | tk-51e8e55cf0e7c6b845a26e90f1ec563a14b60ff6.zip tk-51e8e55cf0e7c6b845a26e90f1ec563a14b60ff6.tar.gz tk-51e8e55cf0e7c6b845a26e90f1ec563a14b60ff6.tar.bz2 | |
Merge 8.6
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index d336f5f..df0bd2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,24 +167,37 @@ matrix: env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: &mactest + - make all tktest - name: "macOS/Clang/Xcode 11.5/Static" os: osx osx_image: xcode11.5 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: *mactest - name: "macOS/Clang/Xcode 11.5/Debug" os: osx osx_image: xcode11.5 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: *mactest - name: "macOS/Clang/Xcode 11.5/Shared/XQuartz" os: osx osx_image: xcode11.5 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: *mactest # Older MacOS versions - name: "macOS/Clang/Xcode 11/Shared" os: osx @@ -192,18 +205,27 @@ matrix: env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: *mactest - name: "macOS/Clang/Xcode 10/Shared" os: osx osx_image: xcode10.3 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: *mactest - name: "macOS/Clang/Xcode 9/Shared" os: osx osx_image: xcode9.4 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13" + install: + - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) + script: *mactest # Test on Windows with MSVC native # - name: "Windows/MSVC/Shared" # os: windows @@ -217,6 +239,15 @@ matrix: # install: [] # script: # - cmd.exe //C vcvarsall.bat x64 '&&' nmake '-f' makefile.vc all tktest +# "make dist" only + - name: "Linux: make dist" + os: linux + dist: bionic + compiler: gcc + env: + - BUILD_DIR=unix + script: + - make dist before_install: - |- case $TRAVIS_OS_NAME in @@ -226,11 +257,13 @@ before_install: esac - cd ${BUILD_DIR} install: - - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1) + - mkdir "$HOME/install dir" + - ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) before_script: - export ERROR_ON_FAILURES=1 script: - make all tktest + - make install cache: directories: - $HOME/AppData/Local/Temp/chocolatey |