From 0619ae6e4e4beffab966756196b9f163b5fbc564 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Tue, 10 Feb 2026 15:30:53 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 46 +++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a4a6f0b..e3a3a7c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero LWS (Double Symlink Fix) +name: Build Wownero LWS (Golden Config) on: push: branches: [ master, main ] @@ -7,11 +7,11 @@ on: env: NODE_TLS_REJECT_UNAUTHORIZED: '0' - CORE_TAG: 'v0.11.4.1' + CORE_TAG: 'v0.11.4.2' # The Complete SDK jobs: # ================================================================== - # JOB 1: LINUX NATIVE (x86_64) - Double Symlink Fix + # JOB 1: LINUX NATIVE (x86_64) # ================================================================== linux-native: runs-on: ubuntu-latest @@ -22,9 +22,9 @@ jobs: - name: Fix DNS run: echo "192.168.88.230 git.such.software" >> /etc/hosts + # We only need libc6-dev. We rely on the SDK for libevent now. - name: Install Static System Libs - # We need libevent-dev to get the libevent.a file - run: apt-get update && apt-get install -y libc6-dev libevent-dev + run: apt-get update && apt-get install -y libc6-dev - name: Manual Checkout env: @@ -53,30 +53,26 @@ jobs: mkdir -p /opt/wownero-sdk tar -xf sdk.tar.gz -C /opt/wownero-sdk - - name: Normalize SDK & Symlink System Libs + - name: Normalize SDK & Symlink RT run: | cd /opt/wownero-sdk/lib find . -name "libzstd*.a" -exec cp -n {} libzstd.a \; || true find . -name "libz*.a" ! -name "*zmq*" -exec cp -n {} libz.a \; || true find . -name "libhidapi*.a" -exec cp -n {} libhidapi.a \; || true - # FIX 1: Symlink system librt.a + # CRITICAL FIX: Symlink system librt.a into the SDK. + # This forces CMake to pick the static version from our "SDK" folder + # instead of finding the dynamic .so in /usr/lib. SYSTEM_RT=$(find /usr -name "librt.a" | head -n 1) if [ -n "$SYSTEM_RT" ]; then + echo "Symlinking $SYSTEM_RT to $(pwd)/librt.a" ln -s "$SYSTEM_RT" librt.a - echo "Symlinked $SYSTEM_RT" else - echo "WARNING: System librt.a not found." - fi - - # FIX 2: Symlink system libevent.a (Forces Static Link) - SYSTEM_EVENT=$(find /usr -name "libevent.a" | head -n 1) - if [ -n "$SYSTEM_EVENT" ]; then - ln -s "$SYSTEM_EVENT" libevent.a - echo "Symlinked $SYSTEM_EVENT" - else - echo "WARNING: System libevent.a not found." + echo "FATAL: System librt.a not found" + exit 1 fi + + ls -lh *.a - name: Install Modern CMake run: | @@ -89,7 +85,7 @@ jobs: mkdir build && cd build SDK_DIR="/opt/wownero-sdk" - # The -DLIBEVENT_LIBRARY flag points to our symlink, guaranteeing static linking. + # -DRT_LIBRARY=rt works because we symlinked it into the SDK lib folder cmake .. -DCMAKE_BUILD_TYPE=Release \ -DBUILD_STATIC=ON \ -DCMAKE_PREFIX_PATH="$SDK_DIR" \ @@ -115,6 +111,7 @@ jobs: -DZLIB_INCLUDE_DIR="$SDK_DIR/include" \ -DLIBEVENT_LIBRARY=$SDK_DIR/lib/libevent.a \ -DLIBEVENT_INCLUDE_DIR=$SDK_DIR/include \ + -DRT_LIBRARY=rt \ -DUSE_READLINE=OFF \ -DCMAKE_EXE_LINKER_FLAGS="-static" @@ -199,10 +196,8 @@ jobs: set(CMAKE_SYSTEM_PROCESSOR ${{ matrix.proc }}) set(CMAKE_C_COMPILER ${{ matrix.target }}-gcc) set(CMAKE_CXX_COMPILER ${{ matrix.target }}-g++) - # Explicit CFLAGS set(CMAKE_C_FLAGS "-D_GNU_SOURCE -D_XOPEN_SOURCE=700" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS "-D_GNU_SOURCE -D_XOPEN_SOURCE=700" CACHE STRING "" FORCE) - set(CMAKE_FIND_ROOT_PATH /opt/wownero-sdk) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) @@ -257,7 +252,7 @@ jobs: path: release/*.tar.gz # ================================================================== - # JOB 3: WINDOWS (x86_64) - Disable ZMQ Async + # JOB 3: WINDOWS (x86_64) - ZMQ Disabled # ================================================================== windows: runs-on: ubuntu-latest @@ -293,7 +288,7 @@ jobs: HEADER="external/monero/contrib/epee/include/storages/portable_storage_val_converters.h" sed -i '1i #include \n#ifdef _WIN32\nchar* strptime(const char* s, const char* f, struct tm* tm) { return 0; }\n#endif' $HEADER - # FIX 3: DISABLE ZMQ_ASYNC ON WINDOWS + # FIX: Disable zmq_async on Windows to fix Boost ASIO errors sed -i '/zmq_async.cpp/d' src/net/CMakeLists.txt - name: Download SDK @@ -310,7 +305,7 @@ jobs: find . -name "libhidapi*.a" -exec cp -n {} libhidapi.a \; || true find . -name "libiconv*.a" -exec cp -n {} libiconv.a \; || true - # Create dummy librt.a + # Create dummy librt.a inside SDK echo "" > dummy.c x86_64-w64-mingw32-gcc -c dummy.c -o dummy.o x86_64-w64-mingw32-ar rcs librt.a dummy.o @@ -438,7 +433,6 @@ jobs: mkdir build && cd build SDK_DIR="$(pwd)/../wownero-sdk" - # Explicitly set ZSTD and ZLIB to ensure we don't accidentally link system dylibs cmake .. -DCMAKE_BUILD_TYPE=Release \ -DBUILD_STATIC=ON \ -DBoost_USE_STATIC_RUNTIME=OFF \ @@ -461,6 +455,8 @@ jobs: -DZSTD_INCLUDE_DIR="$SDK_DIR/include" \ -DZLIB_LIBRARY="$SDK_DIR/lib/libz.a" \ -DZLIB_INCLUDE_DIR="$SDK_DIR/include" \ + -DLIBEVENT_LIBRARY=$SDK_DIR/lib/libevent.a \ + -DLIBEVENT_INCLUDE_DIR=$SDK_DIR/include \ -DUSE_READLINE=OFF make -j$(sysctl -n hw.ncpu)