diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7c14a276a..238fcccd4 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero Core (Clean / Boost 1.90 / CMake 3.28) +name: Build Wownero Core (Stable Restore) on: push: branches: [ master, main ] @@ -34,21 +34,9 @@ jobs: run: | rm -rf * git config --global --add safe.directory '*' - - # --- CRITICAL FIX: FORCE LOCAL MIRRORS --- - # These lines tell Git: "If you try to go to Codeberg, GO HERE INSTEAD." - # We use the internal port 3000 and the token to ensure access. - - # 1. Catch 'https://codeberg.org/wownero/RandomWOW' (no .git) git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/RandomWOW.git".insteadOf "https://codeberg.org/wownero/RandomWOW" - - # 2. Catch 'https://codeberg.org/wownero/RandomWOW.git' (with .git) - git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/RandomWOW.git".insteadOf "https://codeberg.org/wownero/RandomWOW.git" - - # 3. Main Clone + git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/wownero.git".insteadOf "https://codeberg.org/wownero/wownero.git" git clone http://oauth2:$GITHUB_TOKEN@git.such.software:3000/${{ github.repository }}.git . - - # 4. Now update submodules (It will use the re-written URLs above) git submodule update --init --recursive - name: Download macOS SDK @@ -60,22 +48,20 @@ jobs: - name: Install Modern CMake run: | - echo "Installing CMake 3.28.1..." curl -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.tar.gz tar -xf cmake.tar.gz - # Add new cmake to PATH echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Sanitize Makefiles (Restore Stable + Fix macOS) + - name: Sanitize Makefiles (Stable Restoration) run: | - # 1. RESTORE UPSTREAM FILES (Clean slate) + # 1. FETCH CLEAN FILES (Resets any corruption) 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. INJECT ZLIB/ZSTD (Safe append via replacement) + # 2. ADD DEPENDENCIES (Safe Replace) sed -i 's/^packages :=.*/packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd/' contrib/depends/packages/packages.mk - # 3. GENERATE ZLIB.MK (Robust Method) + # 3. ADD ZLIB.MK cat <<'EOF' > contrib/depends/packages/zlib.mk package=zlib $(package)_version=1.3.1 @@ -95,10 +81,9 @@ jobs: $(MAKE) install endef EOF - # Convert 2-space indentation to Tabs for Make sed -i 's/^ /\t/' contrib/depends/packages/zlib.mk - # 4. GENERATE ZSTD.MK (Robust Method) + # 4. ADD ZSTD.MK cat <<'EOF' > contrib/depends/packages/zstd.mk package=zstd $(package)_version=1.5.5 @@ -115,8 +100,8 @@ jobs: EOF sed -i 's/^ /\t/' contrib/depends/packages/zstd.mk - # 5. GENERATE BOOST.MK (Robust Method) - # KEY CHANGE: 'runtime-link=static' for Darwin to match Monero CMake expectations + # 5. RESTORE BOOST.MK (With Static Runtime Fix) + # We use cat <<'EOF' to write the file exactly as it should be. cat <<'EOF' > contrib/depends/packages/boost.mk package=boost $(package)_version=1.90.0 @@ -124,63 +109,55 @@ jobs: $(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 - - # FIX: Use static runtime for Darwin so CMake finds the right libs (tagged -s) $(package)_config_opts_darwin=target-os=darwin runtime-link=static - $(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 - - # Convert 2-space indentation to Tabs for Make (Crucial for success) sed -i 's/^ /\t/' contrib/depends/packages/boost.mk + - name: Build Dependencies + run: | + cd contrib/depends + make HOST=${{ matrix.target }} -j$(nproc) + - name: Build Wownero Core run: | PREFIX=$(pwd)/contrib/depends/${{ matrix.target }} mkdir build && cd build - # Use the new 'cmake' (v3.28) + # Fix for strptime on ARM/Windows if needed + export CXXFLAGS="-D_GNU_SOURCE" + export CFLAGS="-D_GNU_SOURCE" + cmake .. \ -DCMAKE_TOOLCHAIN_FILE=../contrib/depends/${{ matrix.target }}/share/toolchain.cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -195,7 +172,7 @@ jobs: mkdir -p output/lib output/include output/bin find build/bin -type f -exec cp {} output/bin/ \; cp $LIB_DIR/*.a output/lib/ - find build -name "*.a" -exec cp {} output/lib/ \; + # Copy headers so LWS can find them cp -r src output/include/wownero-src cp -r $INC_DIR/* output/include/ tar -czf wownero-core-${{ matrix.target }}.tar.gz -C output .