From 22e25ab5b26d7a437e2599a442b4ae593aba631c Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 10 May 2021 12:28:52 -0400 Subject: [PATCH 01/13] Update osxcmake.yml --- .github/workflows/osxcmake.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/osxcmake.yml b/.github/workflows/osxcmake.yml index a53b0ac..dc61f05 100644 --- a/.github/workflows/osxcmake.yml +++ b/.github/workflows/osxcmake.yml @@ -19,6 +19,8 @@ jobs: runs-on: macos-latest steps: + - run: sudo brew boost flex bison python3 + - run: sudo brew link --force flex bison - uses: actions/checkout@v2 - name: Configure CMake From 864c29f876a87f55b07bc08657de8d7e5a5db117 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 10 May 2021 12:30:11 -0400 Subject: [PATCH 02/13] Update osxcmake.yml --- .github/workflows/osxcmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osxcmake.yml b/.github/workflows/osxcmake.yml index dc61f05..5a8cd8d 100644 --- a/.github/workflows/osxcmake.yml +++ b/.github/workflows/osxcmake.yml @@ -19,8 +19,8 @@ jobs: runs-on: macos-latest steps: - - run: sudo brew boost flex bison python3 - - run: sudo brew link --force flex bison + - run: brew boost flex bison python3 + - run: brew link --force flex bison - uses: actions/checkout@v2 - name: Configure CMake From 17219099fab5ae57ba213ead054ddaa3d3959d2a Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 10 May 2021 12:31:15 -0400 Subject: [PATCH 03/13] Update osxcmake.yml --- .github/workflows/osxcmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osxcmake.yml b/.github/workflows/osxcmake.yml index 5a8cd8d..705d587 100644 --- a/.github/workflows/osxcmake.yml +++ b/.github/workflows/osxcmake.yml @@ -19,7 +19,7 @@ jobs: runs-on: macos-latest steps: - - run: brew boost flex bison python3 + - run: brew install boost flex bison python3 - run: brew link --force flex bison - uses: actions/checkout@v2 From b5dcff476fb1ccd3e165442aff199882bbee4f0f Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 10 May 2021 12:42:00 -0400 Subject: [PATCH 04/13] Update osxcmake.yml --- .github/workflows/osxcmake.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/osxcmake.yml b/.github/workflows/osxcmake.yml index 705d587..28e2e28 100644 --- a/.github/workflows/osxcmake.yml +++ b/.github/workflows/osxcmake.yml @@ -17,7 +17,11 @@ jobs: # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix runs-on: macos-latest - + env: + CMAKE_INCLUDE_PATH: "/usr/local/opt/flex/include" + CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" + LDFLAGS: "-L/usr/local/opt/bison/lib" + PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" steps: - run: brew install boost flex bison python3 - run: brew link --force flex bison From 98089df29f8f6af31731d2c213f3d7fd4e5be659 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 13:34:30 -0400 Subject: [PATCH 05/13] Update homebrew install --- .github/workflows/{osxcmake.yml => osxcpp.yml} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename .github/workflows/{osxcmake.yml => osxcpp.yml} (93%) diff --git a/.github/workflows/osxcmake.yml b/.github/workflows/osxcpp.yml similarity index 93% rename from .github/workflows/osxcmake.yml rename to .github/workflows/osxcpp.yml index 28e2e28..5fe6440 100644 --- a/.github/workflows/osxcmake.yml +++ b/.github/workflows/osxcpp.yml @@ -1,4 +1,4 @@ -name: CICD OSX +name: OSX CICD Pipeline on: push: @@ -23,6 +23,7 @@ jobs: LDFLAGS: "-L/usr/local/opt/bison/lib" PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" steps: + - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - run: brew install boost flex bison python3 - run: brew link --force flex bison - uses: actions/checkout@v2 From 9e1fa9409025ab1464c9e853cd48eadf15b5a5d8 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 14:27:45 -0400 Subject: [PATCH 06/13] next attempt --- .github/workflows/osxcpp.yml | 45 ------------------------------------ .travis.yml | 4 ++-- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/osxcpp.yml diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml deleted file mode 100644 index 5fe6440..0000000 --- a/.github/workflows/osxcpp.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: OSX CICD Pipeline - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - BUILD_TYPE: Release - -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 - runs-on: macos-latest - env: - CMAKE_INCLUDE_PATH: "/usr/local/opt/flex/include" - CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" - LDFLAGS: "-L/usr/local/opt/bison/lib" - PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" - steps: - - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - - run: brew install boost flex bison python3 - - run: brew link --force flex bison - - uses: actions/checkout@v2 - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON - - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - - name: Test - working-directory: ${{github.workspace}}/build - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{env.BUILD_TYPE}} - diff --git a/.travis.yml b/.travis.yml index c532a1c..feef9bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,6 @@ before_script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export LDFLAGS="-L/usr/local/opt/bison/lib" && export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; - then travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON .. && make -j4 && ctest --debug; - else travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON .. && make -j4 && ctest --debug; + then travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -D CMAKE_C_COMPILER=gcc-8 -D CMAKE_CXX_COMPILER=g++-8 .. && make -j4 && ctest --debug; + else travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -D CMAKE_C_COMPILER=gcc-8 -D CMAKE_CXX_COMPILER=g++-8 -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON .. && make -j4 && ctest --debug; fi From 0233edde140ecd3f0940b3fa452770e035697c05 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 14:29:44 -0400 Subject: [PATCH 07/13] Revert "next attempt" This reverts commit 9e1fa9409025ab1464c9e853cd48eadf15b5a5d8. --- .github/workflows/osxcpp.yml | 45 ++++++++++++++++++++++++++++++++++++ .travis.yml | 4 ++-- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/osxcpp.yml diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml new file mode 100644 index 0000000..5fe6440 --- /dev/null +++ b/.github/workflows/osxcpp.yml @@ -0,0 +1,45 @@ +name: OSX CICD Pipeline + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +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 + runs-on: macos-latest + env: + CMAKE_INCLUDE_PATH: "/usr/local/opt/flex/include" + CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" + LDFLAGS: "-L/usr/local/opt/bison/lib" + PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" + steps: + - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + - run: brew install boost flex bison python3 + - run: brew link --force flex bison + - uses: actions/checkout@v2 + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Test + working-directory: ${{github.workspace}}/build + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest -C ${{env.BUILD_TYPE}} + diff --git a/.travis.yml b/.travis.yml index feef9bc..c532a1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,6 @@ before_script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export LDFLAGS="-L/usr/local/opt/bison/lib" && export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; - then travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -D CMAKE_C_COMPILER=gcc-8 -D CMAKE_CXX_COMPILER=g++-8 .. && make -j4 && ctest --debug; - else travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -D CMAKE_C_COMPILER=gcc-8 -D CMAKE_CXX_COMPILER=g++-8 -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON .. && make -j4 && ctest --debug; + then travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON .. && make -j4 && ctest --debug; + else travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON .. && make -j4 && ctest --debug; fi From 4034b77cccf6e56e135c6214fcdbc3bb717c5e59 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 14:33:08 -0400 Subject: [PATCH 08/13] update workflow --- .github/workflows/osxcpp.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml index 5fe6440..f88d206 100644 --- a/.github/workflows/osxcpp.yml +++ b/.github/workflows/osxcpp.yml @@ -23,10 +23,9 @@ jobs: LDFLAGS: "-L/usr/local/opt/bison/lib" PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" steps: - - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + - uses: actions/checkout@v2 - run: brew install boost flex bison python3 - run: brew link --force flex bison - - uses: actions/checkout@v2 - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. From e59f523a12d450b09e678be2a6326c1e5070a78a Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 14:37:44 -0400 Subject: [PATCH 09/13] update workflow --- .github/workflows/osxcpp.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml index f88d206..f4f1aea 100644 --- a/.github/workflows/osxcpp.yml +++ b/.github/workflows/osxcpp.yml @@ -6,9 +6,6 @@ on: pull_request: branches: [ main ] -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - BUILD_TYPE: Release jobs: build: @@ -22,8 +19,9 @@ jobs: CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" LDFLAGS: "-L/usr/local/opt/bison/lib" PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" + BUILD_TYPE: Release steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v1 - run: brew install boost flex bison python3 - run: brew link --force flex bison From 1dad44c72bffbd42e1efa42b71b095f03b33640e Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 14:39:25 -0400 Subject: [PATCH 10/13] update workflow --- .github/workflows/osxcpp.yml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml index f4f1aea..b495c2c 100644 --- a/.github/workflows/osxcpp.yml +++ b/.github/workflows/osxcpp.yml @@ -1,29 +1,17 @@ -name: OSX CICD Pipeline - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] +name: OPSX CICD Pipeline +on: [push] 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 + runs-on: macos-latest - env: - CMAKE_INCLUDE_PATH: "/usr/local/opt/flex/include" - CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" - LDFLAGS: "-L/usr/local/opt/bison/lib" - PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" - BUILD_TYPE: Release + steps: - - uses: actions/checkout@v1 - - run: brew install boost flex bison python3 - - run: brew link --force flex bison + - uses: actions/checkout@v2 + - name: install deps + run: brew install boost flex bison python3 + run: brew link --force flex bison - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. From 9f32b133e288ab5f803d859861eb304b521389b3 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 14:40:21 -0400 Subject: [PATCH 11/13] update workflow --- .github/workflows/osxcpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml index b495c2c..7272cf0 100644 --- a/.github/workflows/osxcpp.yml +++ b/.github/workflows/osxcpp.yml @@ -11,6 +11,7 @@ jobs: - uses: actions/checkout@v2 - name: install deps run: brew install boost flex bison python3 + - name: Link Flex and Bison run: brew link --force flex bison - name: Configure CMake From ee935467425258b13cb8b2a5c3b4416c2879e8f9 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 15:03:22 -0400 Subject: [PATCH 12/13] update workflow --- .github/workflows/osxcpp.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml index 7272cf0..23d4f6d 100644 --- a/.github/workflows/osxcpp.yml +++ b/.github/workflows/osxcpp.yml @@ -1,4 +1,4 @@ -name: OPSX CICD Pipeline +name: OPX CICD Pipeline on: [push] @@ -6,7 +6,11 @@ jobs: build: runs-on: macos-latest - + env: + CMAKE_INCLUDE_PATH: "/usr/local/opt/flex/include" + CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" + LDFLAGS: "-L/usr/local/opt/bison/lib" + PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" steps: - uses: actions/checkout@v2 - name: install deps From 51b798951a1c1b5ce626b724648fcf124a1bec8c Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 10 May 2021 15:06:04 -0400 Subject: [PATCH 13/13] update workflow --- .github/workflows/osxcpp.yml | 35 ----------------------------------- .travis.yml | 8 ++++---- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 .github/workflows/osxcpp.yml diff --git a/.github/workflows/osxcpp.yml b/.github/workflows/osxcpp.yml deleted file mode 100644 index 23d4f6d..0000000 --- a/.github/workflows/osxcpp.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: OPX CICD Pipeline - -on: [push] - -jobs: - build: - - runs-on: macos-latest - env: - CMAKE_INCLUDE_PATH: "/usr/local/opt/flex/include" - CMAKE_LIBRARY_PATH: "/usr/local/opt/flex/lib;/usr/local/opt/bison/lib" - LDFLAGS: "-L/usr/local/opt/bison/lib" - PATH: "/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH" - steps: - - uses: actions/checkout@v2 - - name: install deps - run: brew install boost flex bison python3 - - name: Link Flex and Bison - run: brew link --force flex bison - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON - - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - - name: Test - working-directory: ${{github.workspace}}/build - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{env.BUILD_TYPE}} - diff --git a/.travis.yml b/.travis.yml index c532a1c..277f0b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: - ubuntu-toolchain-r-test - boost-latest packages: - - g++-7 + - g++-8 - libbz2-dev - libgsasl7-dev - uuid-dev @@ -26,7 +26,7 @@ matrix: - libprotobuf-dev - protobuf-compiler env: - - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - os: osx osx_image: xcode12.2 addons: @@ -50,6 +50,6 @@ before_script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export LDFLAGS="-L/usr/local/opt/bison/lib" && export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; - then travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON .. && make -j4 && ctest --debug; - else travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON .. && make -j4 && ctest --debug; + then travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 .. && make -j4 && ctest --debug; + else travis_wait 40 mkdir -p build && cd build && cmake -DTRAVIS=ON -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DBUILD_PYTHON_TESTS=ON -DBUILD_JAR=ON -DPYTHON_ITERATOR_SUPPORT=ON .. && make -j4 && ctest --debug; fi