From 79416cc19665f2441ac047eb3fe31c44db6cb1a1 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Tue, 6 Jan 2026 08:18:07 -0800 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 38 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index b5e133d..c130f1c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,20 +114,22 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP (Critical) --- - - name: Nuke Old Boost Cache + # --- 1. CLEANUP (The Fix for "Is a directory") --- + - name: Clean Environment run: | - # Delete everything related to Boost to ensure a clean slate + echo "Nuking cache and old patch artifacts..." + # Delete build cache 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* - # Also nuke the staging area where the "directory" patch might be hiding - rm -rf external/monero/contrib/depends/work/stage/x86_64-w64-mingw32/boost + + # CRITICAL: Delete the 'packages/boost' folder to remove any directories masking as files + rm -rf external/monero/contrib/depends/packages/boost - # --- 2. UPGRADE BOOST (The "Empty List" Fix) --- - - name: Upgrade Boost Version to 1.80.0 + # --- 2. CONFIGURE BOOST 1.80 --- + - name: Configure Boost 1.80.0 run: | - echo "Forcing depends to use Boost 1.80.0..." + echo "Updating Boost version..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" # 1. Update Version and Hash @@ -138,21 +140,13 @@ jobs: # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. DISABLE PATCHES (The Fix) - # A. Delete any existing lines defining patches - sed -i '/_patches/d' $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 - # B. Append an empty definition to the end to be absolutely sure - echo "package_patches=" >> $BOOST_MK - echo "$(package)_patches=" >> $BOOST_MK - - # 4. REMOVE THE PHYSICAL FILE - # We delete the patch file so the build system can't mistake a directory for it - rm -f external/monero/contrib/depends/packages/boost/fix_aroptions.patch - - # Debug: Check our work - echo "--- BOOST.MK CONTENT ---" - cat $BOOST_MK + # Debug: Prove it is a file + ls -l external/monero/contrib/depends/packages/boost/fix_aroptions.patch # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies