diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4578f85..3fb18db 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,39 +114,43 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. NUKE CACHE (Force Rebuild) --- - - name: Nuke Old Boost Cache + # --- 1. CLEANUP: Nuke EVERYTHING (Cache + Bad Downloads) --- + - name: Nuke Old Boost Cache & Downloads run: | - echo "Deleting cached Boost build..." + echo "Deleting cached Boost build and bad downloads..." 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 + # CRITICAL: Delete the folder where it downloaded the wrong file + rm -rf external/monero/contrib/depends/work/download/boost* - # --- 2. UPGRADE BOOST (The "Hail Mary" Patch) --- + # --- 2. UPGRADE BOOST (The Correct Way) --- - name: Upgrade Boost Version to 1.80.0 run: | - echo "Forcing depends to use Boost 1.80.0 instead of 1.69.0..." + echo "Forcing depends to use Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" - # 1. Update Version + # Fix Underscores (1_69_0 -> 1_80_0) sed -i 's/1_69_0/1_80_0/g' $BOOST_MK - # 2. Update SHA256 Hash (Official Hash for boost_1_80_0.tar.bz2) + # Fix Dots (1.69.0 -> 1.80.0) <-- THIS WAS MISSING + sed -i 's/1.69.0/1.80.0/g' $BOOST_MK + + # Update SHA256 Hash (For boost_1_80_0.tar.bz2) sed -i 's/sha256_hash=.*$/sha256_hash=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0/g' $BOOST_MK - # 3. Disable Old Patches (They will fail on new Boost) + # Disable Old Patches (They will break 1.80) sed -i 's/$(package)_patches=.*//g' $BOOST_MK - # 4. Add Context/Coroutine libraries (Still needed!) + # Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # Debug: Show us the new file + # Debug: Verify the file looks right cat $BOOST_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies run: | cd external/monero/contrib/depends - # This will download and build Boost 1.80.0 (Takes ~15-20 mins) make HOST=x86_64-w64-mingw32 -j$(nproc) # --- 4. PATCH APP CODE (Minimal Fixes Only) --- @@ -155,8 +159,7 @@ jobs: echo "Fixing missing include for GCC 13..." sed -i 's/#include /#include \n#include /' external/monero/contrib/epee/include/net/http_base.h - # NOTE: We REMOVED the downgrades for 'buffer.clear' and 'get_executor' - # because Boost 1.80 supports the code natively! + # NOTE: No other patches needed! Boost 1.80 fixes the code compatibility. # --- 5. COMPILE APP --- - name: Build Windows (Cross-Compile)