From f94f810759196db42558c7e847c02e4b67ae691e Mon Sep 17 00:00:00 2001 From: Android ROM Builder Date: Mon, 30 Jun 2025 01:59:53 +0200 Subject: [PATCH] Fix: Ccache configuration and repo verification issues - Fixed ccache size configuration with proper quoting and default value - Improved repo tool verification with better error handling - Added fallback repo version detection - Resolved 'invalid size: ""30G""' ccache error --- .buildkite/pipeline.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a7801c0..665aaea 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -274,19 +274,24 @@ steps: $$SUDO_CMD chmod a+x /usr/local/bin/repo # Verify repo installation - if ! repo --version &>/dev/null; then - echo "❌ Repo tool installation failed" - exit 1 + if ! repo --version >/dev/null 2>&1; then + echo "❌ Repo tool installation failed - trying alternative installation..." + # Alternative installation method + $$SUDO_CMD python3 /usr/local/bin/repo --version >/dev/null 2>&1 || { + echo "❌ Repo tool completely failed to install" + exit 1 + } fi - echo "✅ Repo tool installed: $$(repo --version | head -1)" + REPO_VERSION=$$(repo --version 2>/dev/null | head -1 || echo "repo installed but version unknown") + echo "✅ Repo tool installed: $$REPO_VERSION" # Configure ccache for build acceleration echo "🚀 Configuring ccache for optimal performance..." export USE_CCACHE=1 export CCACHE_DIR="$$HOME/.ccache" mkdir -p "$$CCACHE_DIR" - ccache -M $$CCACHE_SIZE + ccache -M "$${CCACHE_SIZE:-30G}" ccache -s # Configure git for repo operations