From fe618d6fac7939321b28addb6609c9f5ea192d7f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 11 Apr 2024 09:53:13 +0200 Subject: [PATCH] Do not specify buildache in colcon_defaults --- .github/ci/colcon_defaults.yaml | 3 --- .github/workflows/pixi.yaml | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/ci/colcon_defaults.yaml b/.github/ci/colcon_defaults.yaml index 375d1bd..1002289 100644 --- a/.github/ci/colcon_defaults.yaml +++ b/.github/ci/colcon_defaults.yaml @@ -6,9 +6,6 @@ "--no-warn-unused-cli", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON", - # Use buildcache - "-DCMAKE_C_COMPILER_LAUNCHER=buildcache", - "-DCMAKE_CXX_COMPILER_LAUNCHER=buildcache", # BFD in conda is not compiled with fPIC "-DSTACK_DETAILS_AUTO_DETECT:BOOL=FALSE", "-DSTACK_DETAILS_BFD:BOOL=FALSE", diff --git a/.github/workflows/pixi.yaml b/.github/workflows/pixi.yaml index 6a30f2a..06b1280 100644 --- a/.github/workflows/pixi.yaml +++ b/.github/workflows/pixi.yaml @@ -32,6 +32,8 @@ jobs: run: | echo "BUILDCACHE_CC=x86_64-conda-linux-gnu-gcc" >> $GITHUB_ENV echo "BUILDCACHE_CXX=x86_64-conda-linux-gnu-g++" >> $GITHUB_ENV + echo "CMAKE_C_COMPILER_LAUNCHER=buildcache" >> $GITHUB_ENV + echo "CMAKE_CXX_COMPILER_LAUNCHER=buildcache" >> $GITHUB_ENV - run: | pixi run build --cmake-args \