Skip to content
Permalink
Browse files

Merge pull request #1589 from peternewman/0.10-travis-g++8-fix

Try and fix the g++8 builds on Travis
  • Loading branch information
peternewman committed Nov 10, 2019
2 parents 33c3cb3 + 9d49a62 commit 95cb61c669d4716ba09935c37dd8de69e0a27919
Showing with 52 additions and 11 deletions.
  1. +49 −6 .travis.yml
  2. +1 −1 include/ola/io/OutputStream.h
  3. +2 −3 plugins/osc/README
  4. +0 −1 tools/rdm/TestDefinitions.py
@@ -95,8 +95,9 @@ matrix:
packages:
- *core_build_clang_latest
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-6.0
- sourceline: "ppa:ubuntu-toolchain-r/test"
- sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
- os: linux
dist: xenial
compiler: gcc
@@ -107,7 +108,7 @@ matrix:
packages:
- *core_build_gpp_latest
sources:
- ubuntu-toolchain-r-test
- sourceline: "ppa:ubuntu-toolchain-r/test"
- os: linux
dist: xenial
compiler: gcc
@@ -117,7 +118,7 @@ matrix:
packages:
- *core_build_gpp_latest
sources:
- ubuntu-toolchain-r-test
- sourceline: "ppa:ubuntu-toolchain-r/test"
- os: linux
dist: xenial
compiler: gcc
@@ -129,7 +130,7 @@ matrix:
- *core_build
- g++-4.9
sources:
- ubuntu-toolchain-r-test
- sourceline: "ppa:ubuntu-toolchain-r/test"
- os: linux
dist: xenial
env: TASK='doxygen'
@@ -140,7 +141,7 @@ matrix:
- doxygen
- graphviz
sources:
- ubuntu-toolchain-r-test
- sourceline: "ppa:ubuntu-toolchain-r/test"
- os: linux
dist: xenial
env: TASK='lint'
@@ -193,6 +194,48 @@ matrix:
packages:
- *base_build
allow_failures:
- os: osx
osx_image: xcode9.3
compiler: clang
env:
- TASK='compile'
- CPPUNIT='1.13'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3
compiler: clang
env:
- TASK='compile'
- CPPUNIT='1.14'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3
compiler: gcc
env:
- TASK='compile'
- CPPUNIT='1.13'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3
compiler: gcc
env:
- TASK='compile'
- CPPUNIT='1.14'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3
compiler: clang
env:
- TASK='compile'
- CPPUNIT='1.14'
- LIBFTDI='1'
- os: osx
osx_image: xcode9.3
compiler: gcc
env:
- TASK='compile'
- CPPUNIT='1.14'
- LIBFTDI='1'
- os: linux
dist: xenial
compiler: gcc
@@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* OutputStream.h
* A class that you can write structed data to.
* A class that you can write structured data to.
* Copyright (C) 2012 Simon Newton
*/

@@ -215,9 +215,8 @@ Chapter 2, Plugin Boilerplate
2.1 Plugin ID
-------------

We need to reserve a plugin ID in common/protocol/Ola.proto . Before you pick a
plugin id please send a message to the open-lighting@googlegroups.com list so
we can co-ordinate plugin IDs.
We need to reserve a plugin ID in common/protocol/Ola.proto . Please see the
note in that file regarding how we coordinate assigning plugin IDs.

Once we've assigned a plugin id, we can run `make` in the top directory. This
will update include/ola/plugin_id.h. You'll notice plugin_id.h isn't included
@@ -253,7 +253,6 @@ class DUBSingleUID(TestMixins.DiscoveryMixin,
ResponderTestFixture):
"""Confirm the device responds to just it's own range."""
CATEGORY = TestCategory.NETWORK_MANAGEMENT
CATEGORY = TestCategory.NETWORK_MANAGEMENT
REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES

def LowerBound(self):

0 comments on commit 95cb61c

Please sign in to comment.
You can’t perform that action at this time.