From 64914566c037f244c2b2c06ba02d88d32b9f996e Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Mon, 2 Feb 2026 22:42:56 +0100 Subject: [PATCH] Updated RandomX and miniupnp --- .github/workflows/c-cpp.yml | 95 ------------------------------------- external/src/RandomX | 2 +- external/src/miniupnp | 2 +- 3 files changed, 2 insertions(+), 97 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e79bf1b..f1b6c68 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -326,101 +326,6 @@ jobs: name: p2pool-${{ matrix.config.os }}-aarch64 path: build/p2pool - build-ubuntu-riscv64: - - timeout-minutes: 60 - runs-on: ${{ matrix.config.os }} - - strategy: - matrix: - config: - - {os: ubuntu-22.04, flags: "-fuse-linker-plugin -ffunction-sections"} - - steps: - - name: Setup Alpine Linux - uses: jirutka/setup-alpine@v1 - with: - arch: riscv64 - branch: latest-stable - - - name: Install dependencies - run: | - sudo apt update - sudo apt install -y git build-essential cmake gcc-riscv64-linux-gnu g++-riscv64-linux-gnu binutils-riscv64-linux-gnu xz-utils - sudo cp /usr/riscv64-linux-gnu/lib/* /home/runner/rootfs/alpine-latest-riscv64/lib - - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Build libcurl - run: | - cd external/src/curl - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include - make -j$(nproc) - - - name: Build libuv - run: | - cd external/src/libuv - mkdir build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF - make -j$(nproc) - - - name: Build libzmq - run: | - cd external/src/libzmq - mkdir build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5" - make -j$(nproc) - - - name: Build p2pool - run: | - mkdir build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=riscv64 -DCMAKE_POLICY_VERSION_MINIMUM="3.5" - make -j$(nproc) p2pool - - - name: Run self-test - shell: alpine.sh {0} - run: build/p2pool --test - - - name: Build RandomX tests - run: | - cd build - make -j$(nproc) randomx-tests - - - name: Run RandomX tests - shell: alpine.sh {0} - run: build/external/src/RandomX/randomx-tests - - - name: Build tests - run: | - cd tests - mkdir build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=riscv64 -DCMAKE_POLICY_VERSION_MINIMUM="3.5" - make -j$(nproc) p2pool_tests - - - name: Prepare test data - run: | - cd tests/build - unxz *.xz - - - name: Run tests - shell: alpine.sh {0} - run: | - cd tests/build - ./p2pool_tests - - - name: Archive binary - uses: actions/upload-artifact@v4 - with: - name: p2pool-${{ matrix.config.os }}-riscv64 - path: build/p2pool - build-windows-msys2: timeout-minutes: 60 diff --git a/external/src/RandomX b/external/src/RandomX index d341d6a..8b6c38b 160000 --- a/external/src/RandomX +++ b/external/src/RandomX @@ -1 +1 @@ -Subproject commit d341d6a61c2e85fa7b103d3f5b82e5f4c9e8880a +Subproject commit 8b6c38b5fc3ccf4d0d0cb7ebac0b410d54219931 diff --git a/external/src/miniupnp b/external/src/miniupnp index 88a1515..bdbda46 160000 --- a/external/src/miniupnp +++ b/external/src/miniupnp @@ -1 +1 @@ -Subproject commit 88a1515ea872b037889020c01c07dbcf6e5f5dd7 +Subproject commit bdbda466eda360bb3cac093110655b0127a6847b