Resync focal with 0.10

.github/workflows/annotation.yml

@@ -6,15 +6,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 2.7
       - name: Flake8 with annotations - Python 2
         # Using the flake8 options in the .flake8 file
-        uses: peternewman/actions-flake8@python2
+        uses: TrueBrain/actions-flake8@main
   flake8-annotation-python3:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
       - name: Flake8 with annotations - Python 3
         # Using the flake8 options in the .flake8 file
-        uses: TrueBrain/actions-flake8@master
+        uses: TrueBrain/actions-flake8@main
         with:
           only_warn: 1

.travis-ci.sh

@@ -156,8 +156,8 @@ elif [[ $TASK = 'codespell' ]]; then
   # count the number of codespell errors
   spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles 2>&1 | wc -l)
   if [[ $spellingerrors -ne 0 ]]; then
-    # print the output for info
-    zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles
+    # print the output for info, including the count
+    zrun codespell --count --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles
     echo "Found $spellingerrors spelling errors via codespell"
     exit 1;
   else

.travis.yml

@@ -31,9 +31,12 @@ addons:
      - libavahi-glib1
      - libncurses5-dev
      - libmicrohttpd-dev
+    packages: &core_build_clang_recent
+     - *core_build
+     - clang-10
     packages: &core_build_gpp_latest
      - *core_build
-     - g++-9
+     - g++-10
     packages: &core_build_clang_latest
      - *core_build
      - clang-11
@@ -94,6 +97,7 @@ jobs:
   include:
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='doxygen'
       addons:
         apt:
@@ -106,6 +110,7 @@ jobs:
            - ubuntu-toolchain-r-test
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='lint'
       addons:
         apt:
@@ -114,6 +119,7 @@ jobs:
            - *focal_build_extras_python2
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='check-licences'
       addons:
         apt:
@@ -122,6 +128,7 @@ jobs:
            - *focal_build_extras_python2
     - os: linux
       dist: focal
+      arch: arm64
       env:
         - TASK='codespell'
         - PYTHON='python3'
@@ -133,58 +140,75 @@ jobs:
            - moreutils
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='jshint'
       addons:
         apt:
           packages:
     - os: linux
       dist: focal
-      env: TASK='flake8'
+      arch: arm64
+      env:
+        - TASK='flake8'
       addons:
         apt:
           packages:
            - *base_build
            - *focal_build_extras_python2
     - os: linux
       dist: focal
-      arch: amd64
+      arch: arm64
       compiler: clang
       env:
-        - TASK='compile'
+        - TASK='flake8'
         - PYTHON='python3'
       addons:
         apt:
           packages:
-           - *core_build_clang_latest
-           - *focal_build_extras_python3
-          sources:
-           - sourceline: "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main"
-             key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
-           - sourceline: "ppa:ubuntu-toolchain-r/test"
-    - os: linux
-      dist: focal
-      arch: amd64
-      compiler: gcc
-      env: TASK='compile'
-      python: '2.7'
-      addons:
-        apt:
-          packages:
-           - *core_build_gpp_latest
-           - *focal_build_extras_python2
-          sources:
-           - ubuntu-toolchain-r-test
+           - *base_build
+           - *bionic_build_extras_python3
+# Only run Travis builds against the zero credit partner queue solution
+#    - os: linux
+#      dist: bionic
+#      arch: amd64
+#      compiler: clang
+#      env:
+#        - TASK='compile'
+#        - PYTHON='python3'
+#      addons:
+#        apt:
+#          packages:
+#           - *core_build_clang_latest
+#           - *bionic_build_extras_python3
+#          sources:
+#           - sourceline: "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main"
+#             key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+#           - sourceline: "ppa:ubuntu-toolchain-r/test"
+#    - os: linux
+#      dist: focal
+#      arch: amd64
+#      compiler: gcc
+#      env: TASK='compile'
+#      python: '2.7'
+#      addons:
+#        apt:
+#          packages:
+#           - *core_build_gpp_latest
+#           - *focal_build_extras_python2
+#          sources:
+#           - ubuntu-toolchain-r-test
     - os: linux
       dist: focal
       arch: arm64
       compiler: clang
-      env: TASK='compile'
-      python: '2.7'
+      env:
+        - TASK='compile'
+        - PYTHON='python3'
       addons:
         apt:
           packages:
-           - *core_build
-           - *focal_build_extras_python2
+           - *core_build_clang_recent
+           - *focal_build_extras_python3
     - os: linux
       dist: focal
       arch: arm64
@@ -262,40 +286,41 @@ jobs:
 #           - protobuf
 #           - libftdi0
 #          update: false
-    - os: osx
-      osx_image: xcode9.4
-      compiler: clang
-      env:
-      - TASK='compile'
-      - CPPUNIT='1.14'
-      - PROTOBUF='latest'
-      - LIBFTDI='1'
-      addons:
-        homebrew:
-          packages:
-           - *mac_core_build
-           - cppunit
-           - protobuf
-           - libftdi # install the latest cppunit, which needs C++11
-          update: false
-    - os: osx
-      osx_image: xcode9.4
-      compiler: gcc
-      env:
-      - TASK='compile'
-      - CPPUNIT='1.14'
-      - PROTOBUF='latest'
-      - LIBFTDI='1'
-      addons:
-        homebrew:
-          packages:
-           - *mac_core_build
-           - cppunit
-           - protobuf
-           - libftdi # install the latest cppunit, which needs C++11
-          update: false
+#    - os: osx
+#      osx_image: xcode9.4
+#      compiler: clang
+#      env:
+#      - TASK='compile'
+#      - CPPUNIT='1.14'
+#      - PROTOBUF='latest'
+#      - LIBFTDI='1'
+#      addons:
+#        homebrew:
+#          packages:
+#           - *mac_core_build
+#           - cppunit
+#           - protobuf
+#           - libftdi # install the latest cppunit, which needs C++11
+#          update: false
+#    - os: osx
+#      osx_image: xcode9.4
+#      compiler: gcc
+#      env:
+#      - TASK='compile'
+#      - CPPUNIT='1.14'
+#      - PROTOBUF='latest'
+#      - LIBFTDI='1'
+#      addons:
+#        homebrew:
+#          packages:
+#           - *mac_core_build
+#           - cppunit
+#           - protobuf
+#           - libftdi # install the latest cppunit, which needs C++11
+#          update: false
     - os: linux
-      dist: xenial
+      dist: bionic
+      arch: arm64
       compiler: gcc
       env: TASK='coverage'
       addons:
@@ -306,6 +331,7 @@ jobs:
            - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: xenial
+      arch: arm64
       compiler: gcc
       env: TASK='coverity'
       addons:
@@ -318,20 +344,24 @@ jobs:
            - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='spellintian'
       addons:
         apt:
           packages:
            - *core_build
+           - *bionic_build_extras_python2
            - lintian
            - moreutils
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='spellintian-duplicates'
       addons:
         apt:
           packages:
            - *core_build
+           - *bionic_build_extras_python2
            - lintian
            - moreutils
   allow_failures:
@@ -394,18 +424,28 @@ jobs:
       - PROTOBUF='latest'
       - LIBFTDI='1'
     - os: linux
-      dist: xenial
+      dist: bionic
+      arch: arm64
+      env:
+      - TASK='flake8'
+      - PYTHON='python3'
+    - os: linux
+      dist: bionic
+      arch: arm64
       compiler: gcc
       env: TASK='coverage'
     - os: linux
       dist: xenial
+      arch: arm64
       compiler: gcc
       env: TASK='coverity'
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='spellintian'
     - os: linux
       dist: focal
+      arch: arm64
       env: TASK='spellintian-duplicates'
 
 env:
@@ -445,7 +485,7 @@ before_cache:
 
 before_install:
 #Switch to python 3 where required (focal is Python 3 by default)
- - if [ "$TRAVIS_DIST" != "focal" -a "$PYTHON" == "python3" ]; then pyenv global 3.9.0 || pyenv versions && false; fi
+ - if [ "$TRAVIS_DIST" != "focal" -a "$PYTHON" == "python3" -a "$TRAVIS_CPU_ARCH" != "arm64" ]; then pyenv global 3.9.0 || pyenv versions && false; fi
 #Install pip (2) on focal
  - if [ "$TRAVIS_DIST" == "focal" -a "$PYTHON" != "python3" -a -x /usr/bin/python2 ]; then curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && sudo python2 get-pip.py && rm get-pip.py; fi
 #Fix permissions for unbound (and possibly others)
@@ -467,10 +507,12 @@ before_install:
  #- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew link -f https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/[email protected]; export PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages; echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth; fi
 #Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
- - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-9" CC="ccache gcc-9"; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-10" CC="ccache gcc-10"; fi
  - if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
 #Use the latest clang if we're compiling with clang, except on arm64 where it's not available
  - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" -a "$TRAVIS_CPU_ARCH" != "arm64" ]; then export CXX="clang++-11" CC="clang-11"; fi
+#Use a recent clang if we're compiling with clang on arm64 as the latest isn't available
+ - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" -a "$TRAVIS_CPU_ARCH" == "arm64" ]; then export CXX="clang++-10" CC="clang-10"; fi
 #Report the compiler version
  - $CXX --version
 
@@ -499,7 +541,7 @@ after_failure:
   - if [ -f ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/config.log ]; then cat ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/config.log; fi
 
 after_success:
-  - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-9 -b . -E '.*Test\.cpp$' -E '.*\.pb\.cc$' -E '.*\.pb\.cpp$' -E '.*\.pb\.h$' -E '.*\.yy\.cpp$' -E '.*\.tab\.cpp$' -E '.*\.tab\.h$' -E '.*/doxygen/examples.*$' --gcov-options '\-lp' > /dev/null; fi
+  - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-10 -b . -E '.*Test\.cpp$' -E '.*\.pb\.cc$' -E '.*\.pb\.cpp$' -E '.*\.pb\.h$' -E '.*\.yy\.cpp$' -E '.*\.tab\.cpp$' -E '.*\.tab\.h$' -E '.*/doxygen/examples.*$' --gcov-options '\-lp' > /dev/null; fi
 
 after_script:
   - if [ "$TASK" = "coverity" ]; then tail -n 10000 ${TRAVIS_BUILD_DIR}/cov-int/build-log.txt; cat ${TRAVIS_BUILD_DIR}/cov-int/scm_log.txt; fi

NEWS

@@ -1,3 +1,19 @@
+x/y/2020 ola-0.10.9
+ Features:
+ * 
+
+ API:
+ * 
+
+ RDM Tests:
+ * 
+
+ Bugs:
+ * 
+
+ Internal:
+ *
+
 22/11/2020 ola-0.10.8
  Features:
  * Support DragonFly BSD

README

@@ -2,7 +2,7 @@
 
 [www.openlighting.org/ola](https://www.openlighting.org/ola)
 
-[![Build Status](https://travis-ci.org/OpenLightingProject/ola.svg?branch=master)](https://travis-ci.org/OpenLightingProject/ola) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/r/OpenLightingProject/ola?branch=master)
+[![Build Status](https://travis-ci.com/github/OpenLightingProject/ola.svg?branch=master)](https://travis-ci.com/github/OpenLightingProject/ola) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/r/OpenLightingProject/ola?branch=master)
 
 The Open Lighting Architecture (OLA) is a framework for controlling
 entertainment lighting equipment. Within the entertainment lighting industry,

common/base/Init.cpp

@@ -397,7 +397,7 @@ void ClockInit() {
   TimeStamp now_monotonic;
   TimeStamp now_realtime;
 #ifndef CLOCK_MONOTONIC
-  OLA_DEBUG << "Monotonic clock unavailable. Falling back to real time clock."
+  OLA_DEBUG << "Monotonic clock unavailable. Falling back to real time clock.";
 #endif
   clock.CurrentMonotonicTime(&now_monotonic);
   clock.CurrentRealTime(&now_realtime);