Merge remote-tracking branch 'upstream/development' into belabox-dev2

Author: datagutt

.github/workflows/abi.yml

@@ -15,75 +15,122 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-       SRT_BASE: ${{ steps.commands.outputs.SRT_BASE }}
+       base_version: ${{ steps.build.outputs.SRT_BASE }}
+       tag_version: ${{ steps.build.outputs.SRT_TAG_VERSION }}
     steps:
     - uses: actions/checkout@v3
       with:
         path: gitview_pr
-    - name: configure
+    - id: configure
+      name: Configure (cmake)
       run: |
         cd gitview_pr
         mkdir _build && cd _build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNITTESTS=ON ../
-    - name: build
+        cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNITTESTS=OFF ../
+    - id: build
+      name: Build and dump
       run: |
         sudo apt install -y abi-dumper
         sudo apt install -y tcl
         cd gitview_pr/_build && cmake --build ./
         make install DESTDIR=./installdir
         SRT_TAG_VERSION=v$(../scripts/get-build-version.tcl full)
+        echo "SRT_TAG_VERSION=$SRT_TAG_VERSION" >> "$GITHUB_OUTPUT"
         SRT_TAG=${SRT_TAG_VERSION}dev-$(git rev-parse --short HEAD)
+        echo "TAGGING PR BUILD: $SRT_TAG"
         abi-dumper libsrt.so -o libsrt-pr.dump -public-headers installdir/usr/local/include/srt/ -lver $SRT_TAG
+        ls -ld libsrt-pr.dump
+        sha256sum libsrt-pr.dump
         SRT_BASE=v$(../scripts/get-build-version.tcl base)
         if [[ $SRT_TAG_VERSION == $SRT_BASE ]]; then
-            echo "NOT CHECKING ABI: base version is being built: $SRT_TAG"
-            echo "SRT_BASE=''" >> "$GITHUB_OUTPUT"
-            exit 0
+            echo "NOT CHECKING ABI: base version is being built: $SRT_TAG  (not emitting SRT_BASE)"
+            #echo "SRT_BASE=''" >> "$GITHUB_OUTPUT"
+        else
+            echo "WILL CHECK ABI changes $SRT_BASE - $SRT_TAG_VERSION"
+            echo "SRT_BASE=$SRT_BASE" >> "$GITHUB_OUTPUT"
         fi
-        echo "SRT_BASE=$SRT_BASE" >> "$GITHUB_OUTPUT"
+    - id: upload_pr_dump
+      uses: actions/upload-artifact@v4
+      with:
+        name: abidump_pr
+        path: gitview_pr/_build/libsrt-pr.dump
 
   build_base:
     name: Build base version
     runs-on: ubuntu-latest
     needs: build_pr
-    if: ${{ needs.build_pr.outputs.SRT_BASE != '' }}
+    if: ${{ needs.build_pr.outputs.base_version != '' }}
 
     env:
-       SRT_BASE: ${{ needs.build_pr.outputs.SRT_BASE }}
+       SRT_BASE: ${{ needs.build_pr.outputs.base_version }}
+       SRT_TAG_VERSION: ${{ needs.build_pr.outputs.tag_version }}
     steps:
     - uses: actions/checkout@v3
       with:
         path: gitview_base
         ref: ${{ env.SRT_BASE }}
-    - name: configure_tag
+    - id: configure_tag
+      name: Configure (cmake)
       run: |
-        echo $SRT_TAG_VERSION
+        echo "TAG:$SRT_TAG_VERSION BASE:$SRT_BASE"
+
+        #This is currently a paranoid check - the if should do the job
+        if [[ -z $SRT_BASE ]]; then
+            echo "NO BASE DEFINED. NOT BUILDING"
+            exit 1
+        fi
         cd gitview_base
         mkdir _build && cd _build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNITTESTS=ON ../
-    - name: build_tag
+        cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNITTESTS=OFF ../
+    - id: build_tag
+      name: Build and dump
+      if: ${{ success() }}
       run: |
+        sudo apt install -y abi-dumper
+        sudo apt install -y tcl
         cd gitview_base      
         cd _build && cmake --build ./
         make install DESTDIR=./installdir
+        echo "TAGGING BASE BUILD: $SRT_BASE"
         abi-dumper libsrt.so -o libsrt-base.dump -public-headers installdir/usr/local/include/srt/ -lver $SRT_BASE
+        ls -ld libsrt-base.dump
+        sha256sum libsrt-base.dump
+    - id: upload_base_dump
+      uses: actions/upload-artifact@v4
+      with:
+        name: abidump_base
+        path: gitview_base/_build/libsrt-base.dump
 
   check_abi:
     name: Compare ABI
     runs-on: ubuntu-latest
     needs: [build_pr, build_base]
     env:
-       SRT_BASE: ${{ needs.build_pr.outputs.SRT_BASE }}
+       SRT_BASE: ${{ needs.build_pr.outputs.base_version }}
 
     steps:
+    - name: Download base dump
+      uses: actions/download-artifact@v4
+      with:
+        name: abidump_base
+        path: .
+    - name: Download pr dump
+      uses: actions/download-artifact@v4
+      with:
+        name: abidump_pr
+        path: .
     - name: abi-check
       run: |
-        #git clone https://github.com/lvc/abi-compliance-checker.git
-        cd gitview_pr/submodules
-        git submodule update --init abi-compliance-checker
+        git clone https://github.com/lvc/abi-compliance-checker.git
+        #cd gitview_pr/submodules
+        #git submodule update --init abi-compliance-checker
         cd abi-compliance-checker && sudo make install && cd ../
-        cd ../..
-        abi-compliance-checker -l libsrt -old gitview_base/_build/libsrt-base.dump -new gitview_pr/_build/libsrt-pr.dump
+        #cd ../..
+        echo "FILESYSTEM state before running abi-check at $PWD"
+        ls -l
+        sha256sum libsrt-base.dump
+        sha256sum libsrt-pr.dump
+        abi-compliance-checker -l libsrt -old libsrt-base.dump -new libsrt-pr.dump
         RES=$?
         if (( $RES != 0 )); then
            echo "ABI/API Compatibility check failed with value $?"

.github/workflows/cxx03-ubuntu.yaml

@@ -0,0 +1,29 @@
+name: C++03 (old compat)
+
+on:
+  push:
+    branches: [ "master", "dev" ]
+  pull_request:
+    branches: [ "master", "dev" ]
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: ubuntu
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: configure
+      run: |
+        mkdir _build && cd _build
+        cmake ../ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_STDCXX_SYNC=OFF -DUSE_CXX_STD=c++03 -DENABLE_ENCRYPTION=ON -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON -DENABLE_CODE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+    - name: build
+      # That below is likely SonarQube remains, which was removed earlier.
+      #run: cd _build && build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build .
+      run: cd _build && cmake --build .
+    - name: test
+      run: |
+        cd _build && ctest --extra-verbose
+    - name: codecov
+      run: |
+        source ./scripts/collect-gcov.sh
+        bash <(curl -s https://codecov.io/bash)

.github/workflows/cxx11-macos.yaml

@@ -14,8 +14,11 @@ jobs:
     steps:
     - name: GoogleTest
       run: |
-        curl -o googletest.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/23e7fb4dc0cc73facc3772815741e1deb87d6406/Formula/googletest.rb
-        brew install -s googletest.rb
+		brew extract --version=1.12.1 --force googletest
+        brew install googletest@1.12.1
+        # NOTE: 1.12.1 is the last version that requires C++11; might need update later
+        # curl -o googletest.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/23e7fb4dc0cc73facc3772815741e1deb87d6406/Formula/googletest.rb
+        # brew install -s googletest.rb
     - uses: actions/checkout@v3
     - name: configure
       run: |

.github/workflows/cxx11-ubuntu.yaml

@@ -1,4 +1,4 @@
-name: cxx11
+name: C++11
 
 on:
   push:

.github/workflows/iOS.yaml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        cxxstdsync: [OFF, ON]
+        cxxstdsync: [ON] #[OFF, ON] # cxxsync=off is Linux-gcc-only.
 
     name: iOS-cxxsync${{ matrix.cxxstdsync }}
     runs-on: macos-latest
@@ -20,6 +20,6 @@ jobs:
     - name: configure
       run: |
         mkdir _build && cd _build
-        cmake ../ -DENABLE_ENCRYPTION=OFF -DENABLE_STDCXX_SYNC=${{matrix.cxxstdsync}} -DENABLE_UNITTESTS=OFF -DUSE_CXX_STD=c++11 -DENABLE_BONDING=ON --toolchain scripts/iOS.cmake
+        cmake ../ -DENABLE_ENCRYPTION=OFF -DENABLE_STDCXX_SYNC=${{matrix.cxxstdsync}} -DENABLE_MONOTONIC_CLOCK=OFF -DENABLE_UNITTESTS=OFF -DUSE_CXX_STD=c++11 -DENABLE_BONDING=ON --toolchain scripts/iOS.cmake
     - name: build
       run: cd _build && cmake --build ./

.travis.yml

@@ -1,3 +1,10 @@
+# TRAVIS Configuration file
+#
+# XXX MIND SYNTAX TRICKS:
+#    - Keep column consistency
+#    - TAB characters NOT ALLOWED anywhere
+#    - COLON characters (in freestanding strings) not allowed in the script
+
 language: cpp
 dist: xenial
 
@@ -16,27 +23,27 @@ addons:
         packages:
         - openssl
 
-matrix:
+jobs:
     include:
         - os: linux
           env:
           - BUILD_TYPE=Debug CFG="monotonic openssl werror"
-          - BUILD_OPTS='-DENABLE_BONDING=ON -DCMAKE_CXX_FLAGS="-Werror"'
+          - CMAKE_OPTS='-DENABLE_BONDING=ON -DCMAKE_CXX_FLAGS="-Werror"'
         - env:
           - BUILD_TYPE=Debug CFG="nologging mbedtls monotonic werror"
-          - BUILD_OPTS='-DENABLE_LOGGING=OFF -DUSE_ENCLIB=mbedtls -DENABLE_MONOTONIC_CLOCK=ON -DENABLE_BONDING=ON -DCMAKE_CXX_FLAGS="-Werror"'
+          - CMAKE_OPTS='-DENABLE_LOGGING=OFF -DUSE_ENCLIB=mbedtls -DENABLE_MONOTONIC_CLOCK=ON -DENABLE_BONDING=ON -DCMAKE_CXX_FLAGS="-Werror"'
         - os: linux
           env: BUILD_TYPE=Release CFG=default
-        - os: osx
-          osx_image: xcode11.1
-          env:
-          - BUILD_TYPE=Debug CFG=werror
-          - BUILD_OPTS='-DCMAKE_CXX_FLAGS="-Werror"'
-        - os: osx
-          osx_image: xcode11.1
-          env:
-          - BUILD_TYPE=Release CFG=werror
-          - BUILD_OPTS='-DCMAKE_CXX_FLAGS="-Werror"'
+#       - os: osx
+#         osx_image: xcode11.1
+#         env:
+#         - BUILD_TYPE=Debug CFG=werror
+#         - CMAKE_OPTS='-DCMAKE_CXX_FLAGS="-Werror"'
+#       - os: osx
+#         osx_image: xcode11.1
+#         env:
+#         - BUILD_TYPE=Release CFG=werror
+#         - CMAKE_OPTS='-DCMAKE_CXX_FLAGS="-Werror"'
         - os: linux
           compiler: x86_64-w64-mingw32-g++
           addons:
@@ -53,39 +60,70 @@ matrix:
             - ./Configure --cross-compile-prefix=x86_64-w64-mingw32- mingw64
             - make
             - cd ..
-          env: BUILD_TYPE=Release CFG=default
+          env: BUILD_TYPE=Release CFG=no-UT
 
          # Power jobs
+         # Forcing Focal distro because Xenial
+         # has somehow outdated CMake
         - os: linux
           arch: ppc64le
+          dist: focal
           env:
-          - BUILD_TYPE=Debug
+          - ARCH=PowerPC BUILD_TYPE=Debug
         - arch: ppc64le
+          dist: focal
           env:
-          - BUILD_TYPE=Release CFG=monotonic
-          - BUILD_OPTS='-DENABLE_MONOTONIC_CLOCK=ON'
+          - ARCH=PowerPC BUILD_TYPE=Release CFG=monotonic
+          - CMAKE_OPTS='-DENABLE_MONOTONIC_CLOCK=ON'
 script:
+    - CMAKE_VERSION=$(cmake --version | head -1 | awk '{print $3}')
+    - echo CMAKE version $CMAKE_VERSION
+    - CMAKE_VERSION_OK=$(echo "puts [package vcompare $CMAKE_VERSION 3.10]" | tclsh);
+    - if [ "$CMAKE_VERSION_OK" == "-1" ]; then
+          echo "ERROR - cmake version too old, >=3.10 required";
+          exit 1;
+      fi;
+    - export REQUIRE_UNITTESTS=1
+    - if [ "$TRAVIS_COMPILER" == "x86_64-w64-mingw32-g++" ]; then
+        CMAKE_OPTS+=" -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc";
+        CMAKE_OPTS+=" -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++";
+        CMAKE_OPTS+=" -DENABLE_STDCXX_SYNC=OFF -DENABLE_LOCALIF_WIN32=OFF -DENABLE_UNITTESTS=OFF -DUSE_OPENSSL_PC=OFF";
+        CMAKE_OPTS+=" -DOPENSSL_ROOT_DIR=$PWD/openssl";
+        CMAKE_OPTS+=" -DOPENSSL_CRYPTO_LIBRARY=$PWD/openssl/libcrypto-1_1-x64.dll";
+        CMAKE_OPTS+=" -DCMAKE_SYSTEM_NAME=Windows";
+        REQUIRE_UNITTESTS=0;
+      fi;
+      if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        export PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig";
+      fi;
+      if (( $REQUIRE_UNITTESTS )); then
+        CMAKE_OPTS+=" -DENABLE_UNITTESTS=ON";
+      fi;
     - echo COMPILER $TRAVIS_COMPILER
     - echo SYSTEM $TRAVIS_OS_NAME
     - echo BUILD_TYPE $BUILD_TYPE
-    - echo BUILD_OPTS $BUILD_OPTS
-	- cmake --version | head -1
-    - if [ "$TRAVIS_COMPILER" == "x86_64-w64-mingw32-g++" ]; then
-        export CC="x86_64-w64-mingw32-gcc";
-        export CXX="x86_64-w64-mingw32-g++";
-        CMAKE_OPTS="-DENABLE_UNITTESTS=OFF -DUSE_OPENSSL_PC=OFF -DOPENSSL_ROOT_DIR=\"$PWD/openssl\" -DCMAKE_SYSTEM_NAME=Windows"
-      elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
-        CMAKE_OPTS="-DENABLE_UNITTESTS=ON"
-      elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        export PKG_CONFIG_PATH=$(brew --prefix openssl)"/lib/pkgconfig";
-        CMAKE_OPTS="-DENABLE_UNITTESTS=ON"
-      fi
-    - cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_OPTS $CMAKE_OPTS; then echo "Configure OK"; else cat CMakeFiles/CMakeError.log; fi;
-    - make -j$(nproc);
-    - if [ "$TRAVIS_COMPILER" != "x86_64-w64-mingw32-g++" ]; then
+    - echo CMAKE_OPTS $CMAKE_OPTS
+    - export SUCCESS=0
+    - cmake . --debug-output -DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_OPTS 2>&1 || SUCCESS=$?;
+    - if (($SUCCESS == 0)); then
+         echo "Configure OK";
+      else
+         echo "-- OUTPUT --";
+         cat CMakeFiles/CMakeOutput.log || echo "NO OUTPUT";
+         echo "-- ERRORS --";
+         cat CMakeFiles/CMakeError.log || echo "NO LOGS";
+         exit 1;
+      fi;
+    - make VERBOSE=1 -j$(nproc);
+    - if (( $REQUIRE_UNITTESTS )); then
         ulimit -c unlimited;
-        ./test-srt -disable-ipv6;
-        SUCCESS=$?;
-        if [ -f core ]; then gdb -batch ./test-srt -c core -ex bt -ex "info thread" -ex quit; else echo "NO CORE - NO CRY!"; fi;
-        test $SUCCESS == 0;
-      fi
+        if [ ! -f ./test-srt ]; then
+          echo "ERROR - UT application not found";
+          false;
+        else
+          ./test-srt -disable-ipv6;
+          SUCCESS=$?;
+          if [ -f core ]; then gdb -batch ./test-srt -c core -ex bt -ex "info thread" -ex quit; else echo "NO CORE - NO CRY!"; fi;
+          test $SUCCESS == 0;
+        fi;
+      fi;