Cleanup Windows linker errors, Added null check in get_mx25519_impl, Fixed coverage pages copy
This commit is contained in:
3
.github/workflows/codeql-analysis.yml
vendored
3
.github/workflows/codeql-analysis.yml
vendored
@@ -21,9 +21,6 @@ on:
|
|||||||
|
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
schedule:
|
|
||||||
- cron: '44 11 * * 0'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
analyze:
|
analyze:
|
||||||
name: Analyze
|
name: Analyze
|
||||||
|
|||||||
9
.github/workflows/coverage.yml
vendored
9
.github/workflows/coverage.yml
vendored
@@ -65,21 +65,22 @@ jobs:
|
|||||||
- name: Checkout GitHub Pages repository
|
- name: Checkout GitHub Pages repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: SChernykh/SChernykh.github.io
|
repository: mxhess/mxhess.github.io
|
||||||
token: ${{ secrets.PAGES_DEPLOY_TOKEN }}
|
token: ${{ secrets.PAGES_DEPLOY_TOKEN }}
|
||||||
path: gh-pages
|
path: gh-pages
|
||||||
|
|
||||||
- name: Copy coverage report to GitHub Pages repo
|
- name: Copy coverage report to GitHub Pages repo
|
||||||
run: |
|
run: |
|
||||||
rm -rf gh-pages/p2pool-coverage
|
mkdir -p gh-pages/docs
|
||||||
cp -r tests/build/coverage gh-pages/p2pool-coverage
|
rm -rf gh-pages/docs/p2pool-coverage
|
||||||
|
cp -r tests/build/coverage gh-pages/docs/p2pool-coverage
|
||||||
|
|
||||||
- name: Commit and push coverage report
|
- name: Commit and push coverage report
|
||||||
run: |
|
run: |
|
||||||
cd gh-pages
|
cd gh-pages
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
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 commit -m "Update p2pool coverage report"
|
||||||
git push
|
git push
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,13 @@ static const mx25519_impl* get_mx25519_impl()
|
|||||||
{
|
{
|
||||||
static std::once_flag of;
|
static std::once_flag of;
|
||||||
static const mx25519_impl *impl;
|
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;
|
return impl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -131,6 +131,7 @@ if (WIN32)
|
|||||||
if ((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang))
|
if ((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang))
|
||||||
set(LIBS ${LIBS} bcrypt)
|
set(LIBS ${LIBS} bcrypt)
|
||||||
endif()
|
endif()
|
||||||
|
add_definitions(-DMX25519_STATIC)
|
||||||
elseif (NOT APPLE)
|
elseif (NOT APPLE)
|
||||||
set(LIBS ${LIBS} pthread)
|
set(LIBS ${LIBS} pthread)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user