diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9fa1b85..2943b5d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,39 +114,38 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP (Standard) --- + # --- 1. CLEANUP (Do NOT delete packages/boost) --- - name: Clean Environment run: | - echo "Cleaning build environment..." + echo "Cleaning build artifacts..." 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 + # We delete downloads to force re-download of the correct version rm -rf external/monero/contrib/depends/work/download/boost* - # Delete the patch directory so there is zero confusion - rm -rf external/monero/contrib/depends/packages/boost - # --- 2. UPGRADE BOOST & REMOVE PATCHES (The "Grep -v" Method) --- + # --- 2. UPGRADE BOOST & DISABLE PATCHES --- - name: Configure Boost 1.80.0 run: | - echo "Configuring Boost 1.80.0..." + echo "Modifying boost.mk..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" - # 1. Update Version and Hash + # 1. Update Version 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. Update Hash (Official SHA256 for boost_1_80_0.tar.gz) + sed -i 's/sha256_hash=.*$/sha256_hash=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0/g' $BOOST_MK + + # 3. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. NUKE PATCHES (The Robust Fix) - # We read the file, filter out ANY line with the word "patches", and write it back. - # This guarantees the variable definition is GONE. - grep -v "patches" $BOOST_MK > boost_clean.mk - mv boost_clean.mk $BOOST_MK + # 4. NUKE THE PATCH LIST (Delete the line entirely) + # This removes the instruction to look for patches, so it won't matter if they exist or not. + sed -i '/_patches=/d' $BOOST_MK - # Debug: Verify content (There should be no output from this grep) - echo "--- Checking for leftover patches... ---" - grep "patches" $BOOST_MK || echo "Confirmed: No patches found in Makefile." + # Debug: Verify the file content + echo "--- Verifying boost.mk content ---" + cat $BOOST_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies @@ -170,7 +169,8 @@ jobs: - name: Package Windows run: | cd build/src - zip ../../wownero-lws-windows.zip wownero-lws-daemon.exe wownero-lws-admin.exe wownero-lws-client.exe + # Create zip with explicitly named files found in src + zip ../../wownero-lws-windows.zip wownero-lws-daemon.exe wownero-lws-admin.exe - name: Upload Windows Artifact uses: actions/upload-artifact@v3