From 0c653722520c3898ea11c1653ae9246fd6b61491 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 7 Jan 2026 09:33:45 -0800 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 43 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3285d60..ec73288 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,46 +114,39 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. PROTOCOL A: CACHE PURGE (Fixes Checksum Error) --- - - name: Purge Corrupted Dependency Cache + # --- 1. CLEANUP (Standard) --- + - name: Clean Environment run: | - echo "Forensic cleanup initiated..." - # Target the specific files identified in the failure log - rm -rf external/monero/contrib/depends/sources/boost_1_80_0.tar.gz - rm -rf external/monero/contrib/depends/sources/download-stamps/*boost* - - # Clean build artifacts to prevent 'patch' confusion + echo "Cleaning build environment..." rm -rf external/monero/contrib/depends/work/build/x86_64-w64-mingw32/boost rm -rf external/monero/contrib/depends/built/x86_64-w64-mingw32/boost rm -rf external/monero/contrib/depends/work/download/boost* + # Just in case rm -rf external/monero/contrib/depends/packages/boost - # --- 2. CONFIGURE BOOST 1.80 (Fixes Logic/Patch Error) --- - - name: Configure Boost 1.80.0 + # --- 2. THE ROOT CANAL FIX --- + - name: Configure Boost 1.80.0 & Disable Patching Engine run: | - echo "Injecting Boost 1.80.0 configuration..." + echo "Configuring Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" + FUNCS_MK="external/monero/contrib/depends/funcs.mk" - # 1. Update Version to 1.80.0 + # 1. Update Version and Hash sed -i 's/1_69_0/1_80_0/g' $BOOST_MK sed -i 's/1.69.0/1.80.0/g' $BOOST_MK - - # 2. Set Correct SHA256 for .tar.gz (Protocol B verification) sed -i 's/sha256_hash=.*$/sha256_hash=4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847/g' $BOOST_MK - # 3. Add Missing Libraries + # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 4. NEUTRALIZE PATCHES (The "Grep-v" Strategy) - # We remove ANY line containing the word "patches". - # This guarantees the Makefile variable is undefined/empty. - # This prevents "No such file" and "Hunk failed" errors. - grep -v "patches" $BOOST_MK > boost_clean.mk - mv boost_clean.mk $BOOST_MK - - # Debug: Verify the file is clean - echo "--- Content of boost.mk (Patches removed) ---" - cat $BOOST_MK + # 3. SURGICALLY DISABLE PATCHING IN FUNCS.MK + # We look for the line that says 'patch -p1 ...' and comment it out. + # This disables patching for ALL packages, ensuring 100% clean vanilla builds. + echo "Disabling patch system in funcs.mk..." + sed -i 's/patch -p1/# patch -p1/g' $FUNCS_MK + + # Debug: Verify the surgery + grep "patch -p1" $FUNCS_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies