proper version for gcc

netboxlabs · Dec 27, 2024 · ea47256 · ea47256
1 parent 3200f03
commit ea47256
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml
@@ -36,8 +36,8 @@ jobs:
             cc: aarch64-linux-musl-gcc
             cxx: aarch64-linux-musl-g++
     env:
-      CC: gcc-10
-      CXX: g++-10
+      CC: gcc
+      CXX: g++
       CONAN_USER_HOME: "${{github.workspace}}"
     steps:
       - name: Install sccache from cache

diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
@@ -23,8 +23,8 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     env:
-      CC: gcc-10
-      CXX: g++-10
+      CC: gcc
+      CXX: g++
       CONAN_USER_HOME: "${{github.workspace}}"
 
     steps:

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.64.1"
+    pip3 install "conan==1.66.0"
 
 # need git for current hash for VERSION
 COPY ./.git/ /pktvisor-src/.git/