diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 19e0f0a..b5e133d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,15 +114,17 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP --- + # --- 1. CLEANUP (Critical) --- - name: Nuke Old Boost Cache run: | - echo "Clearing cache..." + # Delete everything related to Boost to ensure a clean slate 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* + # Also nuke the staging area where the "directory" patch might be hiding + rm -rf external/monero/contrib/depends/work/stage/x86_64-w64-mingw32/boost - # --- 2. UPGRADE BOOST (The "Clean Slate" Fix) --- + # --- 2. UPGRADE BOOST (The "Empty List" Fix) --- - name: Upgrade Boost Version to 1.80.0 run: | echo "Forcing depends to use Boost 1.80.0..." @@ -136,20 +138,21 @@ jobs: # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. ERASE PATCH NAME (Target the filename directly) - sed -i 's/fix_aroptions.patch//g' $BOOST_MK + # 3. DISABLE PATCHES (The Fix) + # A. Delete any existing lines defining patches + sed -i '/_patches/d' $BOOST_MK - # 4. MOCK THE FILE (Safety Net) - # CRITICAL FIX: Remove the accidental directory first! - rm -rf external/monero/contrib/depends/packages/boost/fix_aroptions.patch - - # Now create the directory and the empty file correctly - mkdir -p external/monero/contrib/depends/packages/boost - touch external/monero/contrib/depends/packages/boost/fix_aroptions.patch + # B. Append an empty definition to the end to be absolutely sure + echo "package_patches=" >> $BOOST_MK + echo "$(package)_patches=" >> $BOOST_MK - # Debug: Verify it is a file now - echo "--- Patch file status (Should be -rw-r--r--) ---" - ls -l external/monero/contrib/depends/packages/boost/fix_aroptions.patch + # 4. REMOVE THE PHYSICAL FILE + # We delete the patch file so the build system can't mistake a directory for it + rm -f external/monero/contrib/depends/packages/boost/fix_aroptions.patch + + # Debug: Check our work + echo "--- BOOST.MK CONTENT ---" + cat $BOOST_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies