From 8d6a406dccbf3d74a01a06191afeefcbb8d277a3 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Thu, 5 Feb 2026 11:54:30 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 152 +++++++++++++++++++++++++++++------- 1 file changed, 125 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d2b31dd64..0af47b03f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero Core (Tab-Safe Fix) +name: Build Wownero Core (Verified Build + Nuclear Package) on: push: branches: [ master, main ] @@ -52,25 +52,106 @@ jobs: tar -xf cmake.tar.gz echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Reset & Inject Makefiles (Printf Method) + # Restoring the logic from v0.11.4.2 which PROVED to compile correctly + - name: Sanitize Makefiles (Stable + Mac Compat) run: | - # 1. Reset dependency definitions to clean state - cd contrib/depends - git checkout packages/packages.mk packages/boost.mk funcs.mk + # 1. RESTORE UPSTREAM FILES + curl -L -o contrib/depends/funcs.mk https://codeberg.org/wownero/wownero/raw/branch/master/contrib/depends/funcs.mk + curl -L -o contrib/depends/packages/packages.mk https://codeberg.org/wownero/wownero/raw/branch/master/contrib/depends/packages/packages.mk - # 2. Overwrite packages.mk with EXACT order (Zlib/Zstd first) - echo 'packages := zlib zstd libiconv boost openssl expat libusb hidapi protobuf sodium zeromq unbound' > packages/packages.mk + # 2. INJECT ZLIB/ZSTD (Safe Append) + sed -i 's/^packages :=.*/packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd/' contrib/depends/packages/packages.mk - # 3. Create zlib.mk (Using printf for guaranteed tabs) - # We use standard configure/make for robustness - printf 'package=zlib\n$(package)_version=1.3.1\n$(package)_download_path=https://zlib.net/\n$(package)_file_name=$(package)-$($(package)_version).tar.gz\n$(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23\ndefine $(package)_set_vars\n\t$(package)_config_opts=--static\nendef\ndefine $(package)_config_cmds\n\tCHOST=${host} ./configure $($(package)_config_opts) --prefix=$($(package)_staging_prefix_dir)\nendef\ndefine $(package)_build_cmds\n\t$(MAKE) libz.a\nendef\ndefine $(package)_stage_cmds\n\t$(MAKE) install\nendef\n' > packages/zlib.mk + # 3. GENERATE ZLIB.MK + cat <<'EOF' > contrib/depends/packages/zlib.mk + package=zlib + $(package)_version=1.3.1 + $(package)_download_path=https://zlib.net/ + $(package)_file_name=$(package)-$($(package)_version).tar.gz + $(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 + define $(package)_set_vars + $(package)_config_opts=--static + endef + define $(package)_config_cmds + CHOST=${host} ./configure $($(package)_config_opts) --prefix=$($(package)_staging_prefix_dir) + endef + define $(package)_build_cmds + $(MAKE) libz.a + endef + define $(package)_stage_cmds + $(MAKE) install + endef + EOF + sed -i 's/^ /\t/' contrib/depends/packages/zlib.mk - # 4. Create zstd.mk (Using printf) - printf 'package=zstd\n$(package)_version=1.5.5\n$(package)_download_path=https://github.com/facebook/zstd/releases/download/v$($(package)_version)/\n$(package)_file_name=$(package)-$($(package)_version).tar.gz\n$(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4\ndefine $(package)_build_cmds\n\t$(MAKE) -C lib libzstd.a\nendef\ndefine $(package)_stage_cmds\n\tcp lib/libzstd.a $($(package)_staging_prefix_dir)/lib/\n\tcp lib/zstd.h $($(package)_staging_prefix_dir)/include/\nendef\n' > packages/zstd.mk + # 4. GENERATE ZSTD.MK + cat <<'EOF' > contrib/depends/packages/zstd.mk + package=zstd + $(package)_version=1.5.5 + $(package)_download_path=https://github.com/facebook/zstd/releases/download/v$($(package)_version)/ + $(package)_file_name=$(package)-$($(package)_version).tar.gz + $(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 + define $(package)_build_cmds + $(MAKE) -C lib libzstd.a + endef + define $(package)_stage_cmds + cp lib/libzstd.a $($(package)_staging_prefix_dir)/lib/ + cp lib/zstd.h $($(package)_staging_prefix_dir)/include/ + endef + EOF + sed -i 's/^ /\t/' contrib/depends/packages/zstd.mk - # 5. Overwrite boost.mk (Boost 1.90 + Libs + Context/Coroutine) - # Note the \t for tabs. - printf 'package=boost\n$(package)_version=1.90.0\n$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/\n$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2\n$(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305\n$(package)_dependencies=libiconv\ndefine $(package)_set_vars\n\t$(package)_config_opts_release=variant=release\n\t$(package)_config_opts_debug=variant=debug\n\t$(package)_config_opts+=--layout=system --user-config=user-config.jam\n\t$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1\n\t$(package)_config_opts_linux=threadapi=pthread runtime-link=static\n\t$(package)_config_opts_darwin=target-os=darwin runtime-link=shared\n\t$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static\n\t$(package)_config_opts_x86_64_mingw32=address-model=64\n\t$(package)_config_opts_i686_mingw32=address-model=32\n\t$(package)_config_opts_i686_linux=address-model=32 architecture=x86\n\t$(package)_config_opts_x86_64_darwin=address-model=64\n\t$(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs\n\t$(package)_toolset_$(host_os)=gcc\n\t$(package)_archiver_$(host_os)=$($(package)_ar)\n\t$(package)_toolset_darwin=darwin\n\t$(package)_archiver_darwin=$($(package)_libtool)\n\t$(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine\n\t$(package)_cxxflags=-std=c++17 -fPIC\nendef\ndefine $(package)_preprocess_cmds\n\techo "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\nendef\ndefine $(package)_config_cmds\n\t./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)\nendef\ndefine $(package)_build_cmds\n\t./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage\nendef\ndefine $(package)_stage_cmds\n\t./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install\nendef\n' > packages/boost.mk + # 5. GENERATE BOOST.MK (Standard Mac Config) + # We use runtime-link=shared for Darwin because that is the robust way to build portable Mac binaries. + cat <<'EOF' > contrib/depends/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 + + # Darwin uses shared runtime (system libc++). This is standard for portable static libs. + $(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 + + # MACOS ARM FIX + $(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 + sed -i 's/^ /\t/' contrib/depends/packages/boost.mk - name: Build Dependencies run: | @@ -82,10 +163,14 @@ jobs: PREFIX=$(pwd)/contrib/depends/${{ matrix.target }} mkdir build && cd build + # Fix strptime export CXXFLAGS="-D_GNU_SOURCE" export CFLAGS="-D_GNU_SOURCE" + # DEFAULT FLAGS STATIC_RUNTIME="ON" + + # MAC SPECIFIC FIX if [[ "${{ matrix.target }}" == *"apple"* ]]; then STATIC_RUNTIME="OFF" perl -pi -e 's/locale//g' ../CMakeLists.txt @@ -100,29 +185,42 @@ jobs: make -j$(nproc) - - name: Package Artifacts + - name: Package Artifacts (Search & Destroy) run: | LIB_DIR="contrib/depends/${{ matrix.target }}/lib" INC_DIR="contrib/depends/${{ matrix.target }}/include" + # Where depends builds stuff before installing + WORK_DIR="contrib/depends/work/build/${{ matrix.target }}" + mkdir -p output/lib output/include output/bin + # Copy compiled binaries find build/bin -type f -exec cp -v {} output/bin/ \; - # Force copy any .a file found in the prefix lib dir + # 1. Copy installed libs cp -v $LIB_DIR/*.a output/lib/ || true - # Debug listing + # 2. HUNT DOWN ZSTD if missing + if [ ! -f output/lib/libzstd.a ]; then + echo "Zstd missing in prefix. Searching build dir..." + find $WORK_DIR -name "libzstd.a" -o -name "libzstd_static.a" | head -n 1 | xargs -I {} cp -v {} output/lib/libzstd.a + find $WORK_DIR -name "zstd.h" | head -n 1 | xargs -I {} cp -v {} $INC_DIR/ + fi + + # 3. HUNT DOWN ZLIB if missing + if [ ! -f output/lib/libz.a ]; then + echo "Zlib missing in prefix. Searching build dir..." + find $WORK_DIR -name "libz.a" -o -name "libz_static.a" | head -n 1 | xargs -I {} cp -v {} output/lib/libz.a + find $WORK_DIR -name "zlib.h" | head -n 1 | xargs -I {} cp -v {} $INC_DIR/ + fi + + # Verify final payload + echo "=== ARTIFACT CONTENTS ===" ls -l output/lib/ - # Verify ZLIB/ZSTD are there (or fail hard) - if [ ! -f output/lib/libz.a ] && [ ! -f output/lib/libz_static.a ]; then - echo "FATAL: libz.a missing" - exit 1 - fi - if [ ! -f output/lib/libzstd.a ]; then - echo "FATAL: libzstd.a missing" - exit 1 - fi + # Fail if critical libs are still missing + if [ ! -f output/lib/libzstd.a ]; then echo "FATAL: libzstd.a still missing"; exit 1; fi + if [ ! -f output/lib/libz.a ]; then echo "FATAL: libz.a still missing"; exit 1; fi cp -r src output/include/wownero-src cp -r $INC_DIR/* output/include/