Merge pull request #1590 from peternewman/master-resync

Master resync
OpenLightingProject · Nov 10, 2019 · 90c2691 · 90c2691
2 parents dc40569 + 7d8b115
commit 90c2691
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -113,8 +113,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
@@ -125,7 +126,7 @@ matrix:
           packages:
            - *core_build_gpp_latest
           sources:
-           - ubuntu-toolchain-r-test
+           - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: xenial
       compiler: gcc
@@ -135,7 +136,7 @@ matrix:
           packages:
            - *core_build_gpp_latest
           sources:
-           - ubuntu-toolchain-r-test
+           - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: xenial
       compiler: gcc
@@ -147,7 +148,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'
@@ -158,7 +159,7 @@ matrix:
            - doxygen
            - graphviz
           sources:
-           - ubuntu-toolchain-r-test
+           - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: xenial
       env: TASK='lint'
@@ -227,6 +228,66 @@ 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.13'
+      - PROTOBUF='3.6'
+      - LIBFTDI='1'
+    - os: osx
+      osx_image: xcode9.3
+      compiler: gcc
+      env:
+      - TASK='compile'
+      - CPPUNIT='1.13'
+      - PROTOBUF='3.6'
+      - LIBFTDI='1'
+    - os: osx
+      osx_image: xcode9.3
+      compiler: clang
+      env:
+      - TASK='compile'
+      - CPPUNIT='1.14'
+      - PROTOBUF='3.6'
+      - LIBFTDI='1'
+    - os: osx
+      osx_image: xcode9.3
+      compiler: gcc
+      env:
+      - TASK='compile'
+      - CPPUNIT='1.14'
+      - PROTOBUF='3.6'
+      - LIBFTDI='1'
     - os: linux
       dist: xenial
       compiler: gcc

diff --git a/include/ola/io/OutputStream.h b/include/ola/io/OutputStream.h
@@ -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
  */
 

diff --git a/plugins/osc/README.developer.md b/plugins/osc/README.developer.md
@@ -226,14 +226,12 @@ 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
-[mailing list](mailto:open-lighting@googlegroups.com) so we can co-ordinate
-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 in the git repo since it's a generated file.
+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 in the git repo since it's a generated file.
 
 2.2 Plugin Loader
 -----------------

diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py
@@ -256,7 +256,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):