From ea47256ac1bd2b6243659e1d1cde923990db35cd Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Fri, 27 Dec 2024 17:32:01 -0300 Subject: [PATCH] proper version for gcc --- .github/workflows/build_cross.yml | 4 ++-- .github/workflows/code-ql.yml | 4 ++-- docker/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index 6425bcdc7..26e1ac606 100644 --- 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 index f126b51a8..678115439 100644 --- 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 index 5e71c815e..ff36f8094 100644 --- 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/