From bd8db7f9e17eec4f5e0ef32e6bf52dfb1099af4b Mon Sep 17 00:00:00 2001 From: such-gitea Date: Fri, 6 Feb 2026 08:15:01 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 71 +++++++++---------------------------- 1 file changed, 16 insertions(+), 55 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a1f58da78..ba37cf765 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero Core (External Zlib/Zstd) +name: Build Wownero Core (No-Touch Fix) on: push: branches: [ master, main ] @@ -52,66 +52,27 @@ jobs: tar -xf cmake.tar.gz echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Patch Boost Only (Avoid Corrupting Depends) + - name: Build Standard Dependencies (Override Boost Version) run: | - # 1. Ensure we are starting clean cd contrib/depends - git checkout packages/packages.mk packages/boost.mk funcs.mk - # 2. Update Boost to 1.90 (Minimal Safe Injection) - # We use a temp file to avoid sed quoting hell - cat <<'EOF' > packages/boost.mk - package=boost - $(package)_version=1.90.0 - $(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/ - $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2 - $(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305 - $(package)_dependencies=libiconv - define $(package)_set_vars - $(package)_config_opts_release=variant=release - $(package)_config_opts_debug=variant=debug - $(package)_config_opts+=--layout=system --user-config=user-config.jam - $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 - $(package)_config_opts_linux=threadapi=pthread runtime-link=static - $(package)_config_opts_darwin=target-os=darwin runtime-link=shared - $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static - $(package)_config_opts_x86_64_mingw32=address-model=64 - $(package)_config_opts_i686_mingw32=address-model=32 - $(package)_config_opts_i686_linux=address-model=32 architecture=x86 - $(package)_config_opts_x86_64_darwin=address-model=64 - $(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs - $(package)_toolset_$(host_os)=gcc - $(package)_archiver_$(host_os)=$($(package)_ar) - $(package)_toolset_darwin=darwin - $(package)_archiver_darwin=$($(package)_libtool) - $(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine - $(package)_cxxflags=-std=c++17 -fPIC - endef - define $(package)_preprocess_cmds - echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam - endef - define $(package)_config_cmds - ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries) - endef - define $(package)_build_cmds - ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage - endef - define $(package)_stage_cmds - ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install - endef - EOF - # Fix tabs - sed -i 's/^ /\t/' packages/boost.mk - - - name: Build Standard Dependencies - run: | - cd contrib/depends - # This generates the toolchain.cmake and builds Boost/OpenSSL/etc. + # Boost 1.90.0 Constants + BOOST_VER="1.90.0" + BOOST_HASH="49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305" + + # Patch download URL to new location (archives.boost.io) + # We use sed on the specific line to avoid touching recipes + sed -i 's|dl.bintray.com/boostorg/release|archives.boost.io/release|g' packages/boost.mk + + # Force rebuild of boost with new version + # We explicitly pass variables to make to override the file defaults + make HOST=${{ matrix.target }} boost_version=$BOOST_VER boost_sha256_hash=$BOOST_HASH -j$(nproc) + + # Build the rest of the dependencies make HOST=${{ matrix.target }} -j$(nproc) # ----------------------------------------------------- - # NEW: Manually Build Zlib/Zstd using the Generated Toolchain - # This bypasses the broken depends makefiles entirely. + # Manual Static Lib Build (Using Generated Toolchain) # ----------------------------------------------------- - name: Build Static Zlib & Zstd (Manual CMake) run: |