diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a61c62d..ce8854e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,34 +114,35 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP: Nuke Cache & Bad Downloads --- - - name: Nuke Old Boost Cache & Downloads + # --- 1. CLEANUP: Nuke Cache (Essential to fix previous download errors) --- + - name: Nuke Old Boost Cache run: | - echo "Deleting cached Boost build and bad downloads..." + echo "Deleting cached Boost build and 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 rm -rf external/monero/contrib/depends/work/download/boost* - # --- 2. UPGRADE BOOST (Corrected Hash) --- + # --- 2. UPGRADE BOOST (The "Simple & Robust" Way) --- - name: Upgrade Boost Version to 1.80.0 run: | echo "Forcing depends to use Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" - # Fix Version Numbers + # 1. Update Version Numbers (Handle both formats) sed -i 's/1_69_0/1_80_0/g' $BOOST_MK sed -i 's/1.69.0/1.80.0/g' $BOOST_MK - # FIX: Update SHA256 Hash (Correct Hash for .tar.gz) + # 2. Update Hash (For boost_1_80_0.tar.gz) sed -i 's/sha256_hash=.*$/sha256_hash=4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847/g' $BOOST_MK - # Disable Old Patches - sed -i 's/$(package)_patches=.*//g' $BOOST_MK + # 3. DELETE PATCHES (The Fix: Just delete the line entirely) + sed -i '/_patches=/d' $BOOST_MK - # Add Context/Coroutine libraries + # 4. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # Debug: Verify + # Debug: Verify the file content + echo "--- MODIFIED BOOST.MK ---" cat $BOOST_MK # --- 3. BUILD DEPENDENCIES --- @@ -150,7 +151,7 @@ jobs: cd external/monero/contrib/depends make HOST=x86_64-w64-mingw32 -j$(nproc) - # --- 4. PATCH APP CODE (Minimal Fixes Only) --- + # --- 4. PATCH APP CODE --- - name: Patch App Source Code run: | echo "Fixing missing include for GCC 13..."