diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 10458b4..5f680d1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,9 +21,6 @@ on: pull_request: - schedule: - - cron: '44 11 * * 0' - jobs: analyze: name: Analyze diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 19e48bf..ff64bd2 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -65,21 +65,22 @@ jobs: - name: Checkout GitHub Pages repository uses: actions/checkout@v4 with: - repository: SChernykh/SChernykh.github.io + repository: mxhess/mxhess.github.io token: ${{ secrets.PAGES_DEPLOY_TOKEN }} path: gh-pages - name: Copy coverage report to GitHub Pages repo run: | - rm -rf gh-pages/p2pool-coverage - cp -r tests/build/coverage gh-pages/p2pool-coverage + mkdir -p gh-pages/docs + rm -rf gh-pages/docs/p2pool-coverage + cp -r tests/build/coverage gh-pages/docs/p2pool-coverage - name: Commit and push coverage report run: | cd gh-pages git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git add p2pool-coverage + git add docs/p2pool-coverage git commit -m "Update p2pool coverage report" git push diff --git a/src/carrot_crypto.cpp b/src/carrot_crypto.cpp index 4ba3535..d462a6c 100644 --- a/src/carrot_crypto.cpp +++ b/src/carrot_crypto.cpp @@ -59,7 +59,13 @@ static const mx25519_impl* get_mx25519_impl() { static std::once_flag of; static const mx25519_impl *impl; - std::call_once(of, [&](){ impl = mx25519_select_impl(MX25519_TYPE_AUTO); }); + std::call_once(of, [&](){ + impl = mx25519_select_impl(MX25519_TYPE_AUTO); + if (!impl) { + LOGERR(0, "Failed to select mx25519 implementation - unsupported platform"); + PANIC_STOP(); + } + }); return impl; } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c8d3b89..5b25934 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -131,6 +131,7 @@ if (WIN32) if ((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang)) set(LIBS ${LIBS} bcrypt) endif() + add_definitions(-DMX25519_STATIC) elseif (NOT APPLE) set(LIBS ${LIBS} pthread) endif()