diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 99c8cb8..3d80f70 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero LWS (Windows Fix) +name: Build Wownero LWS (Windows Stub Fix) on: push: branches: [ master, main ] @@ -11,7 +11,7 @@ env: jobs: # ================================================================== - # JOB 1: LINUX NATIVE (x86_64) - UNTOUCHED (GREEN) + # JOB 1: LINUX NATIVE (x86_64) - KEEPING AS IS (GREEN) # ================================================================== linux-native: runs-on: ubuntu-latest @@ -104,7 +104,7 @@ jobs: path: release/*.tar.gz # ================================================================== - # JOB 2: LINUX CROSS (ARM64 / RISCV64) - UNTOUCHED (GREEN) + # JOB 2: LINUX CROSS (ARM64 / RISCV64) - KEEPING AS IS (GREEN) # ================================================================== linux-cross: runs-on: ubuntu-latest @@ -154,8 +154,6 @@ jobs: find . -name "libhidapi*.a" -exec cp -n {} libhidapi.a \; || true find . -name "libzstd*.a" -exec cp -n {} libzstd.a \; || true find . -name "libz*.a" ! -name "*zmq*" -exec cp -n {} libz.a \; || true - - # Symlink Cross RT SYSROOT_RT=$(find ${{ matrix.sysroot }} -name "librt.a" 2>/dev/null | head -n 1) if [ -n "$SYSROOT_RT" ]; then ln -s "$SYSROOT_RT" librt.a @@ -163,30 +161,21 @@ jobs: FALLBACK=$(find /usr -name "librt.a" | grep ${{ matrix.proc }} | head -n 1) if [ -n "$FALLBACK" ]; then ln -s "$FALLBACK" librt.a; fi fi - - # FIX: Use 'develop' branch URL - name: Patch Boost Context (Aarch64) if: matrix.target == 'aarch64-linux-gnu' run: | echo "Downloading and compiling missing Boost Context ASM for aarch64..." mkdir -p boost_asm && cd boost_asm - BASE="https://raw.githubusercontent.com/boostorg/context/develop/src/asm" - curl -f -O $BASE/jump_arm64_aapcs_elf_gas.S curl -f -O $BASE/make_arm64_aapcs_elf_gas.S curl -f -O $BASE/ontop_arm64_aapcs_elf_gas.S - if [ ! -s jump_arm64_aapcs_elf_gas.S ]; then echo "FATAL: Empty file downloaded"; exit 1; fi - aarch64-linux-gnu-gcc -c jump_arm64_aapcs_elf_gas.S -o jump.o aarch64-linux-gnu-gcc -c make_arm64_aapcs_elf_gas.S -o make.o aarch64-linux-gnu-gcc -c ontop_arm64_aapcs_elf_gas.S -o ontop.o - aarch64-linux-gnu-ar r /opt/wownero-sdk/lib/libboost_context.a jump.o make.o ontop.o aarch64-linux-gnu-ar s /opt/wownero-sdk/lib/libboost_context.a - echo "Patch applied successfully." - - name: Install Modern CMake run: | 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 @@ -251,7 +240,7 @@ jobs: path: release/*.tar.gz # ================================================================== - # JOB 3: WINDOWS - EXCLUDE CLIENT.CPP + # JOB 3: WINDOWS - STUB & SMASH # ================================================================== windows: runs-on: ubuntu-latest @@ -283,9 +272,24 @@ jobs: perl -pi -e 's/-Werror//g' external/monero/CMakeLists.txt sed -i '1i #include \n#ifdef _WIN32\nchar* strptime(const char* s, const char* f, struct tm* tm) { return 0; }\n#endif' external/monero/contrib/epee/include/storages/portable_storage_val_converters.h - # FIX: DISABLE ZMQ_ASYNC AND CLIENT.CPP ON WINDOWS - sed -i '/zmq_async.cpp/d' src/net/CMakeLists.txt + # 1. Stub zmq_async.h to be a harmless dummy on Windows + echo '#pragma once' > src/net/zmq_async.h + echo '#ifdef _WIN32' >> src/net/zmq_async.h + echo '#include ' >> src/net/zmq_async.h + echo '#include ' >> src/net/zmq_async.h + echo 'namespace net { namespace zmq { struct async_client { struct mock { void cancel(boost::system::error_code = {}) {} }; std::unique_ptr asock; }; } }' >> src/net/zmq_async.h + echo '#else' >> src/net/zmq_async.h + cat src/net/zmq_async.h.original 2>/dev/null || true >> src/net/zmq_async.h + echo '#endif' >> src/net/zmq_async.h + + # 2. Stub out the calls in rest_server.cpp so they don't fail + # We simply comment out lines containing 'asock->cancel' + sed -i 's/.*asock->cancel.*/\/\/ DISABLED ON WINDOWS/g' src/rest_server.cpp + + # 3. Disable client.cpp compilation (still fails if included in build list) sed -i '/client.cpp/d' src/rpc/CMakeLists.txt + # 4. Remove Admin tool (needs client) + sed -i '/wownero-lws-admin/d' src/CMakeLists.txt - name: Download SDK run: | @@ -355,12 +359,12 @@ jobs: -DICONV_LIBRARIES="$SDK_DIR/lib/libiconv.a" \ -DRT_LIBRARY=$SDK_DIR/lib/librt.a \ -DUSE_READLINE=OFF \ - -DCMAKE_EXE_LINKER_FLAGS="-static -Wl,--allow-multiple-definition" + -DCMAKE_EXE_LINKER_FLAGS="-static -Wl,--allow-multiple-definition -L$SDK_DIR/lib" make -j$(nproc) - name: Package run: | mkdir release - zip -j release/wownero-lws-x86_64-w64-mingw32.zip build/src/wownero-lws-daemon.exe build/src/wownero-lws-admin.exe + zip -j release/wownero-lws-x86_64-w64-mingw32.zip build/src/wownero-lws-daemon.exe - name: Upload uses: actions/upload-artifact@v3 with: @@ -368,7 +372,7 @@ jobs: path: release/*.zip # ================================================================== - # JOB 4: MACOS - UNTOUCHED (Manual Checkout) + # JOB 4: MACOS - KEEPING AS IS # ================================================================== macos: runs-on: macos-latest @@ -444,4 +448,4 @@ jobs: run: | mkdir release zip -j release/wownero-lws-${{ matrix.platform }}.zip build/src/wownero-lws-daemon build/src/wownero-lws-admin - # Upload disabled to avoid network crash. \ No newline at end of file + # Upload disabled. \ No newline at end of file