summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml31
-rw-r--r--CHANGELOG2
2 files changed, 17 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index 44153a8..26bef5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,6 +85,21 @@ matrix:
- libgtest-dev
- valgrind
- gdb
+ # Can't use valgrind and asan at the same time.
+ # Should probably fix the test leaks though.
+ - compiler: gcc
+ env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-fsanitize=address FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0 LDFLAGS="-fuse-ld=gold"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - g++-5
+ - libstdc++6-5-dbg
+ - libgtest-dev
+ # - valgrind
+ - gdb
+ allow_failures:
- compiler: gcc
env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 LDFLAGS="-fuse-ld=gold"
addons:
@@ -133,20 +148,6 @@ matrix:
- libgtest-dev
- valgrind
- gdb
- # Can't use valgrind and asan at the same time.
- # Should probably fix the test leaks though.
- - compiler: gcc
- env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-fsanitize=address FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0 LDFLAGS="-fuse-ld=gold"
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - g++-5
- - libstdc++6-5-dbg
- - libgtest-dev
- # - valgrind
- - gdb
# LTO is buggy.
- compiler: gcc
env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-flto LDFLAGS="-fuse-ld=gold"
@@ -160,8 +161,6 @@ matrix:
- libgtest-dev
- valgrind
- gdb
- allow_failures:
- - env: REAL_CC=gcc-5 REAL_CXX=g++-5 REAL_EXTRA=-flto LDFLAGS="-fuse-ld=gold"
# everything that was pushed to stable was already on 'master', except
# the version change and some doc changes.
diff --git a/CHANGELOG b/CHANGELOG
index d596454..0a397f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+v18.2.17.1
+ - fix a few compilation errors
v18.2.17
- fix players sometimes facing the wrong direction after magic attacks
- fix attoconf build