From 96c28eb6fc85bb762d0692f5d464ce47bbb30c14 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 7 Jan 2026 10:26:31 -0800 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 89201cf..29e9fba 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -117,16 +117,14 @@ jobs: # --- 1. CLEANUP --- - name: Clean Environment run: | - 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* rm -rf external/monero/contrib/depends/packages/boost - # --- 2. UPGRADE & DISABLE PATCHES (The "Lobotomy" Fix) --- + # --- 2. UPGRADE & DISABLE PATCHES --- - name: Configure Boost 1.80.0 run: | - echo "Configuring Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" FUNCS_MK="external/monero/contrib/depends/funcs.mk" @@ -138,15 +136,10 @@ jobs: # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. GLOBALLY DISABLE PATCHING - # We replace the 'patch' command with 'true' (do nothing). - # This ensures that even if Make tries to apply a patch, it just "succeeds" instantly. - # We search for 'patch -p1' and replace it. - sed -i 's/patch -p1/true/g' $FUNCS_MK - - # Debug: Verify the surgery (Should show 'true', not 'patch') - echo "--- Checking funcs.mk ---" - grep "true" $FUNCS_MK | head -n 1 + # 3. DISABLE PATCHING ENGINE (The Fix) + # We blindly replace 'patch -p1' with 'true' (do nothing). + # '|| true' ensures this step never fails the build, even if sed finds nothing. + sed -i 's/patch -p1/true/g' $FUNCS_MK || true # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies @@ -157,7 +150,6 @@ jobs: # --- 4. PATCH APP CODE --- - name: Patch App Source Code run: | - echo "Fixing missing include for GCC 13..." sed -i 's/#include /#include \n#include /' external/monero/contrib/epee/include/net/http_base.h # --- 5. COMPILE APP ---