forked from such-gitea/wownero-lws
Update .gitea/workflows/build.yaml
This commit is contained in:
@@ -109,7 +109,6 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
# We MUST clean workspace to ensure the 'depends' system rebuilds Boost
|
||||
echo "Cleaning workspace..."
|
||||
rm -rf *
|
||||
|
||||
@@ -132,29 +131,28 @@ jobs:
|
||||
# 1. Trust the repo
|
||||
git config --global --add safe.directory '*'
|
||||
|
||||
# --- THE MEGA PATCH: UPGRADE BOOST TO 1.80.0 ---
|
||||
# --- THE MEGA PATCH v2: UPGRADE BOOST TO 1.80.0 ---
|
||||
BOOST_MK=external/monero/contrib/depends/packages/boost.mk
|
||||
|
||||
echo 'Applying Mega Patch to boost.mk...'
|
||||
echo 'Applying Mega Patch v2 to boost.mk...'
|
||||
|
||||
# A. Set Version and Hash (Using the tar.gz hash for 1.80.0)
|
||||
# A. Set 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
|
||||
sed -i 's/sha256_hash=.*$/sha256_hash=4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847/g' \$BOOST_MK
|
||||
|
||||
# B. Delete the old 1.69 patches (Critical! Fixes 'Hunk failed' errors)
|
||||
# We delete the lines in the makefile that try to apply these patches.
|
||||
sed -i '/fix_aroptions.patch/d' \$BOOST_MK
|
||||
sed -i '/boost_1_69_0_gcc.patch/d' \$BOOST_MK
|
||||
# B. NUKE ALL PATCHES (The Fix)
|
||||
# Instead of deleting specific files, we delete any line containing '.patch'
|
||||
# This ensures 'fix_arm_arch.patch' and any others are gone forever.
|
||||
sed -i '/\.patch/d' \$BOOST_MK
|
||||
|
||||
# C. Add Context and Coroutine to the build list
|
||||
# We use a safe regex to only append the libs to the configuration line
|
||||
# Safely append libraries to the config line
|
||||
sed -i '/package_config_libraries/s/filesystem/filesystem context coroutine/' \$BOOST_MK
|
||||
|
||||
# --- END PATCH ---
|
||||
|
||||
# 2. Build Dependencies
|
||||
# This will download and build Boost 1.80.0 from scratch.
|
||||
echo 'Building Dependencies (Boost 1.80)...'
|
||||
cd external/monero/contrib/depends
|
||||
make HOST=x86_64-w64-mingw32 -j$(nproc)
|
||||
@@ -164,10 +162,10 @@ jobs:
|
||||
cd ../../../..
|
||||
mkdir -p build && cd build
|
||||
|
||||
# We update CMake to specifically look for 1.80 (just in case)
|
||||
# Ensure CMake looks for 1.80
|
||||
sed -i 's/1.70/1.80/g' ../CMakeLists.txt || true
|
||||
|
||||
# Standard CMake Configure with Static Libraries
|
||||
# Standard CMake Configure
|
||||
cmake .. \
|
||||
-DCMAKE_TOOLCHAIN_FILE=../external/monero/contrib/depends/x86_64-w64-mingw32/share/toolchain.cmake \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
|
||||
Reference in New Issue
Block a user