From b8c1176c7917bca6976c1ac46faa6d587cc3062f Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Sun, 9 Jun 2019 14:27:45 -0700 Subject: [PATCH] - travis CI uses g++ on Linux --- .travis.yml | 28 ++++++++++++++-------------- CHANGELOG.md | 4 ++++ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37fc6a3f..c80ef67d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,23 +12,23 @@ matrix: - python test/run.py - make ws - # # Linux - # - os: linux - # dist: xenial - # script: - # - python test/run.py - # - make ws - # env: - # - CC=gcc - # - CXX=g++ - - # Clang + Linux disabled for now + # Linux - os: linux dist: xenial - script: python test/run.py + script: + - python test/run.py + - make ws env: - - CC=clang - - CXX=clang++ + - CC=gcc + - CXX=g++ + + # Clang + Linux disabled for now + # - os: linux + # dist: xenial + # script: python test/run.py + # env: + # - CC=clang + # - CXX=clang++ # Windows - os: windows diff --git a/CHANGELOG.md b/CHANGELOG.md index babb97fd..fd40f76e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## [unreleased] - 2019-06-09 +### Changed +- travis CI uses g++ on Linux + ## [4.0.0] - 2019-06-09 ### Changed - WebSocket::send() sends message in TEXT mode by default