From 6d8157e85ec7a219ceed83641e9f21f84d3c5edd Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 7 Jan 2026 05:45:02 -0800 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 44 ++++++++++++++----------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 248823d..bdd754d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,49 +114,39 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP --- + # --- 1. CLEANUP (Standard) --- - name: Clean Environment run: | - echo "Clearing cache..." + 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* - # Remove stage to ensure no old patches linger - rm -rf external/monero/contrib/depends/work/stage/x86_64-w64-mingw32/boost + # Remove the patch directory entirely so no files can be found by accident + rm -rf external/monero/contrib/depends/packages/boost - # --- 2. UPGRADE BOOST & NEUTRALIZE ALL PATCHES --- - - name: Upgrade Boost Version to 1.80.0 + # --- 2. UPGRADE BOOST & DISABLE PATCHES (The Variable Nuke) --- + - name: Configure Boost 1.80.0 run: | - echo "Forcing depends to use Boost 1.80.0..." + echo "Modifying boost.mk..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" - PATCH_DIR="external/monero/contrib/depends/packages/boost" - # 1. Update Version and Hash in Makefile - # This renames patches too! (e.g. boost_1_69_0.patch -> boost_1_80_0.patch) + # 1. Update Version and Hash (Standard Fix) sed -i 's/1_69_0/1_80_0/g' $BOOST_MK sed -i 's/1.69.0/1.80.0/g' $BOOST_MK sed -i 's/sha256_hash=.*$/sha256_hash=4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847/g' $BOOST_MK - # 2. Add Context/Coroutine libraries + # 2. Add Context/Coroutine libraries (Standard Fix) sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. AUTO-ZERO ALL PATCHES - # Ensure directory exists - mkdir -p $PATCH_DIR - - # We search the MODIFIED Makefile for any word ending in .patch - # We then create that file (empty) in the patch directory. - echo "Scanning for patches to neutralize..." - grep -o '[A-Za-z0-9._-]*\.patch' $BOOST_MK | sort | uniq | while read -r patch_file; do - echo "Creating dummy patch: $patch_file" - echo -n "" > "$PATCH_DIR/$patch_file" - done - - # Safety Net: Explicitly create fix_aroptions.patch just in case grep missed it - echo -n "" > "$PATCH_DIR/fix_aroptions.patch" + # 3. NUKE THE PATCH LIST (The Logic Fix) + # We look for any line containing "_patches" and an "=" sign. + # We replace the ENTIRE LINE with an empty variable declaration. + # This forces Make to believe there are zero patches to apply. + sed -i 's/^.*_patches.*=.*$/$(package)_patches=/' $BOOST_MK - # Debug: Show the dummy files we created - ls -l $PATCH_DIR + # Debug: Verify the file looks correct (Look for the empty patches line) + echo "--- Verifying boost.mk content ---" + cat $BOOST_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies