summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-07 14:34:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-07 14:34:16 (GMT)
commit33af30e08024b750f0d1dac56a108c622b7f9a23 (patch)
tree406f1c57f262b5fe86f1447dbef78436fd17e183 /.travis.yml
parent53d6118a090b1b452072c01b26df2bd43ee8e49b (diff)
parentf6bd13629fa5edb7707fc6adb73029c9a09b5e1f (diff)
downloadtcl-33af30e08024b750f0d1dac56a108c622b7f9a23.zip
tcl-33af30e08024b750f0d1dac56a108c622b7f9a23.tar.gz
tcl-33af30e08024b750f0d1dac56a108c622b7f9a23.tar.bz2
Merge 8.7
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 2 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index a7c1d2f..c777c99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -241,15 +241,6 @@ jobs:
before_install: *vcpreinst
install: []
script:
- - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt' '-f' makefile.vc all tcltest
- - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt' '-f' makefile.vc test
- - name: "Windows/MSVC/StaticPackage"
- os: windows
- compiler: cl
- env: *vcenv
- before_install: *vcpreinst
- install: []
- script:
- cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,staticpkg,msvcrt' '-f' makefile.vc all tcltest
- cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,staticpkg,msvcrt' '-f' makefile.vc test
- name: "Windows/MSVC/Debug"
@@ -296,8 +287,8 @@ jobs:
before_install: *vcpreinst
install: []
script:
- - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,msvcrt' '-f' makefile.vc all tcltest
- - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,msvcrt' '-f' makefile.vc test
+ - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,staticpkg,msvcrt' '-f' makefile.vc all tcltest
+ - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,staticpkg,msvcrt' '-f' makefile.vc test
- name: "Windows/MSVC-x86/Debug"
os: windows
compiler: cl