From 7f8eac93dbdb40f1878aa25084bd43138831d878 Mon Sep 17 00:00:00 2001 From: tequ Date: Fri, 28 Nov 2025 00:25:13 +0900 Subject: [PATCH] enable linker on release-builder --- .github/workflows/xahau-ga-nix.yml | 4 ---- build-full.sh | 5 ++--- release-builder.sh | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/xahau-ga-nix.yml b/.github/workflows/xahau-ga-nix.yml index a1df68e92..71402a984 100644 --- a/.github/workflows/xahau-ga-nix.yml +++ b/.github/workflows/xahau-ga-nix.yml @@ -5,7 +5,6 @@ on: branches: ["dev", "candidate", "release"] pull_request: branches: ["dev", "candidate", "release"] - workflow_dispatch: schedule: - cron: '0 0 * * *' @@ -280,9 +279,6 @@ jobs: pipx install "conan>=2.0,<3" echo "$HOME/.local/bin" >> $GITHUB_PATH - # # Add ccache PATH - # echo "/usr/lib/ccache" >> $GITHUB_PATH - - name: Check environment run: | echo "PATH:" diff --git a/build-full.sh b/build-full.sh index 9723da654..f66422f46 100644 --- a/build-full.sh +++ b/build-full.sh @@ -67,9 +67,8 @@ fi # Environment setup moved to Dockerfile in release-builder.sh source /opt/rh/gcc-toolset-11/enable export PATH=/usr/local/bin:$PATH -export CC='ccache gcc' && -export CXX='ccache g++' && -echo "-- Build Rippled --" && +export PATH=/usr/lib/ccache:$PATH +echo "-- Build Rippled --" pwd && echo "MOVING TO [ build-core.sh ]"; diff --git a/release-builder.sh b/release-builder.sh index 672e68042..fdf72397d 100755 --- a/release-builder.sh +++ b/release-builder.sh @@ -128,9 +128,6 @@ ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++" ENV LLVM_DIR=/usr/lib64/llvm14/lib/cmake/llvm ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a -ENV CC='ccache gcc' -ENV CXX='ccache g++' - # Install LLD RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \ cd /tmp && \ @@ -189,6 +186,7 @@ RUN cd /tmp && \ # Set environment variables ENV PATH=/usr/local/bin:$PATH +ENV PATH=/usr/lib/ccache:$PATH # Configure ccache and Conan 2 # NOTE: Using echo commands instead of heredocs because heredocs in Docker RUN commands are finnicky