Update conan CI version to 1.61.0 and re-enable macos build (#693)

netboxlabs · Oct 17, 2023 · d4f43a2 · d4f43a2
1 parent c9a0ab3
commit d4f43a2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 51 deletions.
diff --git a/.github/actions/build-cpp/Dockerfile b/.github/actions/build-cpp/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /pktvisor-src
 RUN apt-get update && \
     apt-get upgrade --yes --force-yes && \
     apt-get install --yes --force-yes --no-install-recommends ${BUILD_DEPS} && \
-    pip3 install 'conan==1.59.0' --force-reinstall
+    pip3 install 'conan==1.61.0' --force-reinstall
 
 RUN chmod +x /entrypoint.sh
 

diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -24,16 +24,10 @@ 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-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - name: install gcc 12.2
-        run: |  
-          gcc --version
-          brew search gcc
-          brew install gcc@12
-          gcc --version
-      
+
       - 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
@@ -43,37 +37,40 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.60.1
-
-#       - name: Setup Conan Cache
-#         uses: actions/cache@v3
-#         with:
-#           path: ${{github.workspace}}/build/conan_home/
-#           key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
-#           restore-keys: conan-${{ runner.os }}-
-
-#       - 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
+          version: 1.61.0
+
+      - name: Setup OSX Environment
+        run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
+
+      - name: Setup Conan Cache
+        uses: actions/cache@v3
+        with:
+          path: ${{github.workspace}}/build/conan_home/
+          key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
+          restore-keys: conan-${{ runner.os }}-
+
+      - 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
 
   unit-tests-linux:
     # The CMake configure and build commands are platform agnostic and should work equally
@@ -99,7 +96,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: linux package install
         run: |
@@ -166,7 +163,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Remove libpcap from conanfile
         shell: bash
@@ -396,7 +393,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Configure CMake to generate VERSION
         shell: bash

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -32,7 +32,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Setup Conan Cache
         uses: actions/cache@v3
@@ -84,7 +84,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Configure CMake to generate VERSION
         shell: bash
@@ -134,7 +134,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Configure CMake to generate VERSION
         shell: bash
@@ -279,7 +279,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Remove libpcap from conanfile
         shell: bash

diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml
@@ -69,7 +69,7 @@ jobs:
           curl -L "${{matrix.toolchain}}" | tar -C toolchain -xz --strip-components=1
 
       - name: Install Conan
-        run: pip install --no-cache-dir 'conan==1.59.0' --force-reinstall
+        run: pip install --no-cache-dir 'conan==1.61.0' --force-reinstall
 
       - name: Create Conan configuration
         run: |

diff --git a/.github/workflows/build_debug.yml b/.github/workflows/build_debug.yml
@@ -33,7 +33,7 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.59.0
+          version: 1.61.0
 
       - name: Setup Conan Cache
         uses: actions/cache@v3

diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
@@ -60,7 +60,7 @@ jobs:
     - run: |
         # Run Build - set up dependencies, env vars, compile, and make test
         #install conan
-        pip install --no-cache-dir 'conan==1.59.0' --force-reinstall
+        pip install --no-cache-dir 'conan==1.61.0' --force-reinstall
         # create conan config
         CONAN_V2_MODE=1 conan config init
         conan config set general.revisions_enabled=1

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -6,7 +6,7 @@ RUN \
     apt-get update && \
     apt-get upgrade --yes --force-yes && \
     apt-get install --yes --force-yes --no-install-recommends ${BUILD_DEPS} && \
-    pip3 install "conan==1.59.0"
+    pip3 install "conan==1.61.0"
 
 # need git for current hash for VERSION
 COPY ./.git/ /pktvisor-src/.git/