Update .gitea/workflows/build.yaml

This commit is contained in:
2026-01-07 10:19:55 -08:00
parent 5d4e58d718
commit 058cf2152d

View File

@@ -121,27 +121,14 @@ jobs:
rm -rf external/monero/contrib/depends/work/build/x86_64-w64-mingw32/boost 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/built/x86_64-w64-mingw32/boost
rm -rf external/monero/contrib/depends/work/download/boost* rm -rf external/monero/contrib/depends/work/download/boost*
# Delete the patch directory to prevent "Is a directory" errors
rm -rf external/monero/contrib/depends/packages/boost rm -rf external/monero/contrib/depends/packages/boost
# --- 2. DISABLE PATCHING ENGINE (The "True" Fix) --- # --- 2. UPGRADE & DISABLE PATCHES (The "Lobotomy" Fix) ---
- name: Disable Patch System
run: |
FUNCS_MK="external/monero/contrib/depends/funcs.mk"
echo "Neutering the patch function in $FUNCS_MK..."
# We search for the patch command and replace it with 'true'.
# 'true' always returns exit code 0 and does nothing.
# We accept failure (|| true) in sed just in case, to prevent the step from crashing.
sed -i 's/patch -p1/true/g' $FUNCS_MK || true
# SAFETY NET: Just in case it's using a variable like $(PATCH)
sed -i 's/$(PATCH) -p1/true/g' $FUNCS_MK || true
# --- 3. CONFIGURE BOOST 1.80 ---
- name: Configure Boost 1.80.0 - name: Configure Boost 1.80.0
run: | run: |
echo "Configuring Boost 1.80.0..."
BOOST_MK="external/monero/contrib/depends/packages/boost.mk" BOOST_MK="external/monero/contrib/depends/packages/boost.mk"
FUNCS_MK="external/monero/contrib/depends/funcs.mk"
# 1. Update Version and Hash # 1. Update Version and Hash
sed -i 's/1_69_0/1_80_0/g' $BOOST_MK sed -i 's/1_69_0/1_80_0/g' $BOOST_MK
@@ -151,14 +138,18 @@ jobs:
# 2. Add Context/Coroutine libraries # 2. Add Context/Coroutine libraries
sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK
# 3. CLEAR PATCH LIST (Variable Nuke) # 3. GLOBALLY DISABLE PATCHING
# We append an empty definition at the end. In Make, the last definition wins.
echo "" >> $BOOST_MK
echo "package_patches=" >> $BOOST_MK
echo "$(package)_patches=" >> $BOOST_MK
# Debug check [Image of circuit breaker]
tail -n 5 $BOOST_MK
# We replace the 'patch' command with 'true' (do nothing).
# This ensures that even if Make tries to apply a patch, it just "succeeds" instantly.
# We search for 'patch -p1' and replace it.
sed -i 's/patch -p1/true/g' $FUNCS_MK
# Debug: Verify the surgery (Should show 'true', not 'patch')
echo "--- Checking funcs.mk ---"
grep "true" $FUNCS_MK | head -n 1
# --- 3. BUILD DEPENDENCIES --- # --- 3. BUILD DEPENDENCIES ---
- name: Build Windows Dependencies - name: Build Windows Dependencies