Merge branch 'master' of github.com:fluent/fluent-bit

.github/workflows/README.workflows.md

@@ -11,4 +11,5 @@
 | [integration-build-pr](./integration-build-pr.yaml)     | Builds a docker image to be used in integration testing (pr branch) | on new commit/push on PR(s) |
 | [integration-run-master](./integration-run-master.yaml)     | Runs the integration testing suite on master | on new image built|
 | [integration-run-pr](./integration-run-pr.yaml)     | Runs the integration testing suite on a PR branch | pr opened / label created 'ok-to-test' |
+| [unit-tests](./unit-tests.yaml)     | Runs the unit tests suite on master push or new PR | PR opened, merge in master branch |
 

.github/workflows/integration-build-pr.yaml

@@ -35,11 +35,3 @@ jobs:
           pr: ${{ github.event.number }}
           arch: x86_64
           dockerhub_organization: fluentbitdev
-
-      - uses: actions-ecosystem/action-add-labels@v1
-        name: Label the PR
-        with:
-          labels: ci/integration-docker-ok
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          number: ${{ github.event.pull_request.number }}
-          repo: fluent/fluent-bit

.github/workflows/integration-run-pr.yaml

@@ -61,6 +61,14 @@ jobs:
           arch: x86_64
           dockerhub_organization: fluentbitdev
 
+      - uses: actions-ecosystem/action-add-labels@v1
+        name: Label the PR
+        with:
+          labels: ci/integration-docker-ok
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          number: ${{ github.event.pull_request.number }}
+          repo: fluent/fluent-bit
+
   run-integration-microk8s:
     name: run integration tests on ${{ matrix.k8s-release }} microk8s
     needs: publish-docker-images

.github/workflows/pr-closed-docker.yaml

@@ -11,7 +11,7 @@ jobs:
       - uses: addnab/docker-run-action@v2
         with:
           image: lumir/remove-dockerhub-tag
-          run: python3 remove-dockerhub-tag.py --user ${{ env.dockerhub_username }} --password ${{ env.dockerhub_password }} ${{ env.dockerhub_organization }}/fluent-bit:${{ env.arch }}-master-pr-${{ env.pr }}
+          run: python3 remove-dockerhub-tag.py --user ${{ env.dockerhub_username }} --password ${{ env.dockerhub_password }} ${{ env.dockerhub_organization }}/fluent-bit:${{ env.arch }}-master-pr-${{ env.pr }} || exit 0
         env:
           pr: ${{ github.event.number }}
           arch: x86_64

.github/workflows/unit-tests.yaml

@@ -0,0 +1,75 @@
+name: Run unit tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+    types: [opened, edited, synchronize]
+jobs:
+  run-unit-tests-amd64:
+    name: Run unit tests on amd64 for ${{ matrix.os }} - ${{ matrix.compiler }} - ${{ matrix.flb_option }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 48
+      fail-fast: false
+      matrix:
+        flb_option: [ "-DFLB_JEMALLOC=On", "-DFLB_JEMALLOC=Off", "-DFLB_SMALL=On", "-DSANITIZE_ADDRESS=On", "-DSANITIZE_UNDEFINED=On", "-DFLB_COVERAGE=On"]
+        os: [ubuntu-18.04, macos-latest]
+        compiler: [ gcc, clang ]
+        exclude:
+          - os: macos-latest
+            flb_option: "-DFLB_JEMALLOC=On"
+          - os: macos-latest
+            flb_option: "-DFLB_SMALL=On"
+          - os: macos-latest
+            flb_option: "-DSANITIZE_ADDRESS=On"
+          - os: macos-latest
+            flb_option: "-DSANITIZE_UNDEFINED=On"
+          - os: macos-latest
+            flb_option: "-DFLB_COVERAGE=On"
+          - os: macos-latest
+            flb_option: "-DFLB_JEMALLOC=Off"
+            compiler: clang
+          - os: ubuntu-18.04
+            flb_option: "-DFLB_COVERAGE=On"
+            compiler: clang
+    steps:
+      - name: Setup environment ubuntu-18.04
+        if: matrix.os == 'ubuntu-18.04'
+        run: |
+          sudo apt install -yyq gcc-7 g++-7 clang-6.0 libsystemd-dev gcovr
+          sudo ln -s /usr/bin/llvm-symbolizer-6.0 /usr/bin/llvm-symbolizer || true
+
+      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+        with:
+          repository: calyptia/fluent-bit-ci
+          path: ci
+
+      - name: Run ci/s/run-unit-tests.sh on ${{ matrix.os }} with ${{ matrix.compiler }} - ${{ matrix.flb_option }}
+        if: matrix.os == 'ubuntu-18.04'
+        run: |
+          echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT"
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 90
+          sudo usermod -a -G systemd-journal $(id -un)
+          sudo -E su -p $(id -un) -c "PATH=$PATH ci/scripts/run-unit-tests.sh"
+        env:
+          CC: ${{ matrix.compiler }}
+          CXX: ${{ matrix.compiler }}
+          FLB_OPT: ${{ matrix.flb_option }}
+
+      - name: Run ci/s/run-unit-tests.sh on ${{ matrix.os }} with ${{ matrix.compiler }} - ${{ matrix.flb_option }}
+        if: matrix.os == 'macos-latest'
+        run: |
+          echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT"
+          brew update
+          brew install bison flex || true
+          ci/scripts/run-unit-tests.sh || true
+        env:
+          CC: gcc
+          CXX: g++
+          FLB_OPT: ${{ matrix.flb_option }}

CMakeLists.txt

@@ -422,6 +422,12 @@ if(FLB_TLS)
   option(INSTALL_MBEDTLS_HEADERS OFF)
   add_subdirectory(${FLB_PATH_LIB_MBEDTLS} EXCLUDE_FROM_ALL)
 
+  # Link OpenSSL statically on Windows.
+  if (FLB_SYSTEM_WINDOWS)
+    set(OPENSSL_USE_STATIC_LIBS ON)
+    set(OPENSSL_MSVC_STATIC_RT  ON)
+  endif()
+
   # find OpenSSL (our preferred choice now)
   find_package(OpenSSL)
   if(OPENSSL_FOUND)

appveyor.yml

@@ -1,13 +1,13 @@
 version: v1-winbuild-{build}
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 platform:
   - Win32
   - x64
 
 environment:
-  vspath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community'
+  vspath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community'
   winflexbison: https://github.com/lexxmark/winflexbison/releases/download/v2.5.22/win_flex_bison-2.5.22.zip
   PATH: '%PATH%;C:\WinFlexBison'
 
@@ -21,6 +21,8 @@ install:
   - ps: Copy-Item -Path /WinFlexBison/win_flex.exe /WinFlexBison/flex.exe
 
 before_build:
+  - git clone --depth=1 https://github.com/calyptia/fluent-bit-ci.git ci
+  - ps: Copy-Item -Path .\ci\scripts\run-unit-tests.ps1 .\ci\do-ut.ps1
   - if %PLATFORM%==Win32 call "%vspath%\VC\Auxiliary\Build\vcvars32.bat"
   - if %PLATFORM%==x64   call "%vspatH%\VC\Auxiliary\Build\vcvars64.bat"