Merge pull request #35 from ns1/release/3.1.0

Release/3.1.0

Author: weyrick

.dockerignore

@@ -1 +1,4 @@
-tests/external
+cmake-build*
+integration_tests/external*
+Dockerfile
+.dockerignore

.github/workflows/cmake.yml

@@ -0,0 +1,112 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - release/**
+  push:
+    branches:
+      - master
+      - develop
+      - release/**
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Create Build Environment
+        # Some projects don't allow in-source building, so create a separate build directory
+        # We'll use this as our working directory for all subsequent commands
+        run: cmake -E make_directory ${{github.workspace}}/build
+
+      - name: Get Conan
+        # You may pin to the exact commit or the version.
+        # uses: turtlebrowser/get-conan@4dc7e6dd45c8b1e02e909979d7cfc5ebba6ddbe2
+        uses: turtlebrowser/[email protected]
+
+      - name: Conan profile
+        run: |
+          conan profile new --detect default
+
+      - name: Conan profile (linux)
+        if: matrix.os == 'ubuntu-latest'
+        run:
+          conan profile update settings.compiler.libcxx=libstdc++11 default
+
+      - name: Conan install
+        working-directory: ${{github.workspace}}/build
+        run: conan install ..
+
+      - name: linux package install
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes --no-install-recommends libpcap-dev pkgconf golang ca-certificates libmaxminddb-dev jq
+
+      - name: osx package install
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew update
+          brew install libmaxminddb
+
+      - name: PcapPlusPlus checkout
+        run: |
+          git clone https://github.com/ns1/PcapPlusPlus.git
+          cd PcapPlusPlus
+          mkdir ${{github.workspace}}/local
+
+      - name: PcapPlusPlus config (linux)
+        if: matrix.os == 'ubuntu-latest'
+        working-directory: ${{github.workspace}}/PcapPlusPlus
+        run: |
+          ./configure-linux.sh --install-dir ${{github.workspace}}/local
+
+      - name: PcapPlusPlus config (macos)
+        if: matrix.os == 'macos-latest'
+        working-directory: ${{github.workspace}}/PcapPlusPlus
+        run: |
+          ./configure-mac_os_x.sh --install-dir ${{github.workspace}}/local
+
+      - name: PcapPlusPlus install
+        working-directory: ${{github.workspace}}/PcapPlusPlus
+        run: |
+          make libs
+          make install -j 2
+
+      - name: Configure CMake
+        # Use a bash shell so we can use the same syntax for environment variable
+        # access regardless of the host operating system
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        # Note the current convention is to use the -S and -B options here to specify source
+        # and build directories, but this is only available with CMake 3.13 and higher.
+        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+        run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        # Execute the build.  You can specify a specific target with "--target <NAME>"
+        run: cmake --build . --config $BUILD_TYPE -- -j 2
+
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        # Execute tests defined by the CMake configuration.
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+        run: ctest -C $BUILD_TYPE

.gitignore

@@ -2,4 +2,5 @@
 cmake-build-*/
 .DS_Store*
 docs/html-documentation-generated*
-tests/external
+integration_tests/external
+golang/pkg/client/version.go

.gitmodules

@@ -0,0 +1 @@
+

3rd/CMakeLists.txt

@@ -0,0 +1,6 @@
+
+message(STATUS "3rd party libraries")
+
+add_subdirectory(datasketches)
+add_subdirectory(rng)
+add_subdirectory(timer)