diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-20 14:19:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-20 14:19:47 (GMT) |
| commit | 8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7 (patch) | |
| tree | 76766700a957612731a3f874580f69cd4fbed17b /.travis.yml | |
| parent | 041d53289bc378deaabc7600ef8e79e5e6c4d8e9 (diff) | |
| parent | 12d3b15f307754ea15cceabd761e0f60346e9cc4 (diff) | |
| download | tcl-8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7.zip tcl-8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7.tar.gz tcl-8ff40f7d464bb599fa69cd1a8a16d89edf1ef3c7.tar.bz2 | |
Merge 8.7
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index 26ab8de..78acab8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,20 +10,13 @@ matrix: compiler: gcc env: - BUILD_DIR=unix - - name: "Linux/GCC/Shared: UTF_MAX=6" + - name: "Linux/GCC/Shared: UTF_MAX=4" os: linux dist: xenial compiler: gcc env: - BUILD_DIR=unix - - CFGOPT=CFLAGS=-DTCL_UTF_MAX=6 - - name: "Linux/GCC/Shared: UTF_MAX=3" - os: linux - dist: xenial - compiler: gcc - env: - - BUILD_DIR=unix - - CFGOPT=CFLAGS=-DTCL_UTF_MAX=3 + - CFGOPT=CFLAGS=-DTCL_UTF_MAX=4 - name: "Linux/GCC/Shared: NO_DEPRECATED" os: linux dist: xenial @@ -221,7 +214,7 @@ matrix: script: - cmd.exe /C 'vcvarsall.bat x64 && nmake -f makefile.vc all tcltest' - cmd.exe /C 'vcvarsall.bat x64 && nmake -f makefile.vc test' - - name: "Windows/MSVC/Shared: UTF_MAX=6" + - name: "Windows/MSVC/Shared: UTF_MAX=4" os: windows compiler: cl env: *vcenv @@ -267,7 +260,7 @@ matrix: script: - cmd.exe /C 'vcvarsall.bat x86 && nmake -f makefile.vc all tcltest' - cmd.exe /C 'vcvarsall.bat x86 && nmake -f makefile.vc test' - - name: "Windows/MSVC-x86/Shared: UTF_MAX=6" + - name: "Windows/MSVC-x86/Shared: UTF_MAX=4" os: windows compiler: cl env: *vcenv @@ -313,19 +306,12 @@ matrix: before_install: &makepreinst - choco install -y make zip - cd ${BUILD_DIR} - - name: "Windows/GCC/Shared: UTF_MAX=6" + - name: "Windows/GCC/Shared: UTF_MAX=4" os: windows compiler: gcc env: - BUILD_DIR=win - - CFGOPT="--enable-64bit CFLAGS=-DTCL_UTF_MAX=6" - before_install: *makepreinst - - name: "Windows/GCC/Shared: UTF_MAX=3" - os: windows - compiler: gcc - env: - - BUILD_DIR=win - - CFGOPT="--enable-64bit CFLAGS=-DTCL_UTF_MAX=3" + - CFGOPT="--enable-64bit CFLAGS=-DTCL_UTF_MAX=4" before_install: *makepreinst - name: "Windows/GCC/Shared: NO_DEPRECATED" os: windows @@ -355,19 +341,12 @@ matrix: env: - BUILD_DIR=win before_install: *makepreinst - - name: "Windows/GCC-x86/Shared: UTF_MAX=6" - os: windows - compiler: gcc - env: - - BUILD_DIR=win - - CFGOPT="CFLAGS=-DTCL_UTF_MAX=6" - before_install: *makepreinst - - name: "Windows/GCC-x86/Shared: UTF_MAX=3" + - name: "Windows/GCC-x86/Shared: UTF_MAX=4" os: windows compiler: gcc env: - BUILD_DIR=win - - CFGOPT="CFLAGS=-DTCL_UTF_MAX=3" + - CFGOPT="CFLAGS=-DTCL_UTF_MAX=4" before_install: *makepreinst - name: "Windows/GCC-x86/Shared: NO_DEPRECATED" os: windows |