diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5a94812..4f4f217 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero LWS (Mac x86 Fix) +name: Build Wownero LWS (All Green) on: push: branches: [ master, main ] @@ -11,7 +11,7 @@ env: jobs: # ================================================================== - # JOB 1: LINUX NATIVE - UNTOUCHED + # JOB 1: LINUX NATIVE (x86_64) # ================================================================== linux-native: runs-on: ubuntu-latest @@ -29,7 +29,6 @@ jobs: run: | rm -rf * git init - git config --global --add safe.directory '*' git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/RandomWOW.git".insteadOf "https://codeberg.org/wownero/RandomWOW" git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/wownero.git".insteadOf "https://codeberg.org/wownero/wownero.git" git remote add origin http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/${{ github.repository }}.git @@ -104,7 +103,7 @@ jobs: path: release/*.tar.gz # ================================================================== - # JOB 2: LINUX CROSS - UNTOUCHED + # JOB 2: LINUX CROSS (ARM64 / RISCV64) # ================================================================== linux-cross: runs-on: ubuntu-latest @@ -130,7 +129,6 @@ jobs: run: | rm -rf * git init - git config --global --add safe.directory '*' git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/RandomWOW.git".insteadOf "https://codeberg.org/wownero/RandomWOW" git config --global url."http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/Builds/wownero.git".insteadOf "https://codeberg.org/wownero/wownero.git" git remote add origin http://oauth2:${GITHUB_TOKEN}@git.such.software:3000/${{ github.repository }}.git @@ -155,7 +153,12 @@ jobs: find . -name "libzstd*.a" -exec cp -n {} libzstd.a \; || true find . -name "libz*.a" ! -name "*zmq*" -exec cp -n {} libz.a \; || true 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; else FALLBACK=$(find /usr -name "librt.a" | grep ${{ matrix.proc }} | head -n 1); if [ -n "$FALLBACK" ]; then ln -s "$FALLBACK" librt.a; fi; fi + if [ -n "$SYSROOT_RT" ]; then + ln -s "$SYSROOT_RT" librt.a + else + FALLBACK=$(find /usr -name "librt.a" | grep ${{ matrix.proc }} | head -n 1) + if [ -n "$FALLBACK" ]; then ln -s "$FALLBACK" librt.a; fi + fi - name: Patch Boost Context (Aarch64) if: matrix.target == 'aarch64-linux-gnu' run: | @@ -194,7 +197,34 @@ jobs: run: | mkdir build && cd build SDK_DIR="/opt/wownero-sdk" - cmake .. -DCMAKE_TOOLCHAIN_FILE=../cross.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH="$SDK_DIR" -DBOOST_ROOT="$SDK_DIR" -DBoost_NO_SYSTEM_PATHS=ON -DBoost_NO_BOOST_CMAKE=ON -DOPENSSL_ROOT_DIR="$SDK_DIR" -DOPENSSL_USE_STATIC_LIBS=TRUE -DUNBOUND_INCLUDE_DIR="$SDK_DIR/include" -DUNBOUND_LIBRARY="$SDK_DIR/lib/libunbound.a" -DZMQ_INCLUDE_DIR="$SDK_DIR/include" -DZMQ_LIBRARY="$SDK_DIR/lib/libzmq.a" -DSodium_INCLUDE_DIR="$SDK_DIR/include" -DSodium_LIBRARY_RELEASE="$SDK_DIR/lib/libsodium.a" -DLIBUSB_INCLUDE_DIR="$SDK_DIR/include" -DLIBUSB_LIBRARY="$SDK_DIR/lib/libusb-1.0.a" -DHIDAPI_INCLUDE_DIR="$SDK_DIR/include" -DHIDAPI_LIBRARY="$SDK_DIR/lib/libhidapi.a;$SDK_DIR/lib/libusb-1.0.a;$SDK_DIR/lib/libudev.a" -DZSTD_LIBRARY="$SDK_DIR/lib/libzstd.a" -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 -DRT_LIBRARY=rt -DUSE_READLINE=OFF -DCMAKE_EXE_LINKER_FLAGS="-static -Wl,--allow-multiple-definition" + cmake .. -DCMAKE_TOOLCHAIN_FILE=../cross.cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_STATIC=ON \ + -DCMAKE_PREFIX_PATH="$SDK_DIR" \ + -DBOOST_ROOT="$SDK_DIR" \ + -DBoost_NO_SYSTEM_PATHS=ON \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DOPENSSL_ROOT_DIR="$SDK_DIR" \ + -DOPENSSL_USE_STATIC_LIBS=TRUE \ + -DUNBOUND_INCLUDE_DIR="$SDK_DIR/include" \ + -DUNBOUND_LIBRARY="$SDK_DIR/lib/libunbound.a" \ + -DZMQ_INCLUDE_DIR="$SDK_DIR/include" \ + -DZMQ_LIBRARY="$SDK_DIR/lib/libzmq.a" \ + -DSodium_INCLUDE_DIR="$SDK_DIR/include" \ + -DSodium_LIBRARY_RELEASE="$SDK_DIR/lib/libsodium.a" \ + -DLIBUSB_INCLUDE_DIR="$SDK_DIR/include" \ + -DLIBUSB_LIBRARY="$SDK_DIR/lib/libusb-1.0.a" \ + -DHIDAPI_INCLUDE_DIR="$SDK_DIR/include" \ + -DHIDAPI_LIBRARY="$SDK_DIR/lib/libhidapi.a;$SDK_DIR/lib/libusb-1.0.a;$SDK_DIR/lib/libudev.a" \ + -DZSTD_LIBRARY="$SDK_DIR/lib/libzstd.a" \ + -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 \ + -DRT_LIBRARY=rt \ + -DUSE_READLINE=OFF \ + -DCMAKE_EXE_LINKER_FLAGS="-static -Wl,--allow-multiple-definition" make -j$(nproc) - name: Package run: | @@ -207,7 +237,7 @@ jobs: path: release/*.tar.gz # ================================================================== - # JOB 4: MACOS - ARCH SPECIFIC COMPILATION + # JOB 3: MACOS (ARM64 & x86_64) - RT FIX + ARCH FIX + JIT FIX # ================================================================== macos: runs-on: macos-latest @@ -244,7 +274,8 @@ jobs: perl -pi -e 's/handler_loop\s+final/handler_loop/g' src/rest_server.cpp perl -pi -e 's/find_library\(ICU/# find_library(ICU/g' external/monero/CMakeLists.txt perl -pi -e 's/locale//g' external/monero/CMakeLists.txt - # Delete 'rt' so it doesn't try to link against it + + # Delete 'rt' so it never links against it perl -pi -e 's/rt //g' CMakeLists.txt perl -pi -e 's/RT_LIBRARY//g' CMakeLists.txt @@ -258,27 +289,23 @@ jobs: mkdir -p wownero-sdk tar -xf sdk.tar.gz -C wownero-sdk - # FIX: Compile dummy lib with the CORRECT ARCHITECTURE - name: Create Dummy RT Lib run: | - echo "Creating dummy librt.a for ${{ matrix.arch }}..." mkdir -p wownero-sdk/lib echo "void dummy_rt_func() {}" > dummy.c cc -arch ${{ matrix.arch }} -c dummy.c -o dummy.o ar cr wownero-sdk/lib/librt.a dummy.o ranlib wownero-sdk/lib/librt.a - # FIX: Patch x86_64 Boost Context - name: Patch Boost Context (x86_64) if: matrix.arch == 'x86_64' run: | - echo "Patching broken x86 boost context..." mkdir -p boost_asm && cd boost_asm BASE="https://raw.githubusercontent.com/boostorg/context/develop/src/asm" curl -f -O $BASE/jump_x86_64_sysv_macho_gas.S curl -f -O $BASE/make_x86_64_sysv_macho_gas.S curl -f -O $BASE/ontop_x86_64_sysv_macho_gas.S - if [ ! -s jump_x86_64_sysv_macho_gas.S ]; then echo "FATAL: Empty file"; exit 1; fi + if [ ! -s jump_x86_64_sysv_macho_gas.S ]; then exit 1; fi clang -c -arch x86_64 jump_x86_64_sysv_macho_gas.S -o jump.o clang -c -arch x86_64 make_x86_64_sysv_macho_gas.S -o make.o clang -c -arch x86_64 ontop_x86_64_sysv_macho_gas.S -o ontop.o @@ -289,13 +316,12 @@ jobs: run: | mkdir build && cd build SDK_DIR="$(pwd)/../wownero-sdk" - cmake .. -DCMAKE_BUILD_TYPE=Release \ -DBUILD_STATIC=ON \ -DBoost_USE_STATIC_RUNTIME=OFF \ -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \ -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} \ - -DARCH="${{ matrix.build_arch }}" \ + -DARCH=${{ matrix.build_arch }} \ -DCMAKE_PREFIX_PATH="$SDK_DIR" \ -DBOOST_ROOT="$SDK_DIR" \ -DOPENSSL_ROOT_DIR="$SDK_DIR" \ @@ -316,10 +342,9 @@ jobs: -DZLIB_INCLUDE_DIR="$SDK_DIR/include" \ -DLIBEVENT_LIBRARY=$SDK_DIR/lib/libevent.a \ -DLIBEVENT_INCLUDE_DIR=$SDK_DIR/include \ - -DRT_LIBRARY="$SDK_DIR/lib/librt.a" \ + -DRT_LIBRARY="" \ -DUSE_READLINE=OFF \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,-L$SDK_DIR/lib" - make -j$(sysctl -n hw.ncpu) - name: Package