diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c130f1c..6c582d5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,22 +114,20 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP (The Fix for "Is a directory") --- + # --- 1. CLEANUP --- - name: Clean Environment run: | - echo "Nuking cache and old patch artifacts..." - # Delete build cache + # Remove build artifacts to prevent caching issues 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* - - # CRITICAL: Delete the 'packages/boost' folder to remove any directories masking as files - rm -rf external/monero/contrib/depends/packages/boost + # Remove the staging area + rm -rf external/monero/contrib/depends/work/stage/x86_64-w64-mingw32/boost - # --- 2. CONFIGURE BOOST 1.80 --- + # --- 2. UPGRADE BOOST TO 1.80 (VANILLA) --- - name: Configure Boost 1.80.0 run: | - echo "Updating Boost version..." + echo "Configuring Vanilla Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" # 1. Update Version and Hash @@ -140,13 +138,25 @@ jobs: # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. CREATE DUMMY PATCH (The Fix for "No such file") - # We do NOT delete the line from the makefile. We just give it the file it wants. - mkdir -p external/monero/contrib/depends/packages/boost - touch external/monero/contrib/depends/packages/boost/fix_aroptions.patch + # 3. DISABLE ALL PATCHES (The Real Fix) + # We forcefully override the variables at the end of the file. + # This tells Make: "There are ZERO patches for this package." + echo "" >> $BOOST_MK + echo "package_patches=" >> $BOOST_MK + echo "$(package)_patches=" >> $BOOST_MK + echo "boost_patches=" >> $BOOST_MK + + # 4. REMOVE PATCH FILES (Scorched Earth) + # We delete the entire directory containing the old patch files. + # This guarantees that even if Make tries to run a patch, it can't find the old ones. + rm -rf external/monero/contrib/depends/packages/boost - # Debug: Prove it is a file - ls -l external/monero/contrib/depends/packages/boost/fix_aroptions.patch + # We recreate the empty directory just to keep Make happy if it checks for existence. + mkdir -p external/monero/contrib/depends/packages/boost + + # Debug: Verify + echo "--- Tail of boost.mk ---" + tail -n 5 $BOOST_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies