Skip to content

Commit d3585bd

Browse files
committed
CI: fix CodeQL LevelDB C++20 build, Windows DLL path, docs flags
CodeQL: switch from Debug to Release to avoid Conan rebuilding LevelDB 1.23 which has a std::memory_order scoped enum bug in C++20. Share Conan cache with build.yml for faster runs. Windows: copy DLL next to exe (not just lib/) for portable ZIP — Windows DLL search only checks the exe's directory. Docs: add missing --embedded-ltc --embedded-doge flags to Linux running examples.
1 parent ee5c6ef commit d3585bd

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ jobs:
220220
$PKG = "c2pool-${VERSION}-windows-x86_64"
221221
New-Item -ItemType Directory -Path "${PKG}/lib","${PKG}/config","${PKG}/web-static","${PKG}/explorer" -Force
222222
Copy-Item build_ci/src/c2pool/Release/c2pool.exe "${PKG}/"
223+
# DLL must be next to exe for Windows DLL search path (portable ZIP)
224+
# Also copy to lib/ for Inno Setup installer compatibility
225+
Copy-Item "${env:GITHUB_WORKSPACE}/secp256k1/bin/libsecp256k1-6.dll" "${PKG}/"
223226
Copy-Item "${env:GITHUB_WORKSPACE}/secp256k1/bin/libsecp256k1-6.dll" "${PKG}/lib/"
224227
Copy-Item start.bat "${PKG}/"
225228
Copy-Item -Recurse web-static/* "${PKG}/web-static/"

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ jobs:
6767
uses: actions/cache@v5
6868
with:
6969
path: ~/.conan2
70-
key: conan2-codeql-ubuntu24-gcc13-debug-${{ hashFiles('conanfile.txt') }}
71-
restore-keys: |
72-
conan2-codeql-ubuntu24-gcc13-debug-
70+
# Share cache with build.yml (same Release profile)
71+
key: conan2-ubuntu24-gcc13-${{ hashFiles('conanfile.txt') }}
72+
restore-keys: conan2-ubuntu24-gcc13-
7373

7474
- if: matrix.build-mode == 'manual'
7575
name: Install Conan dependencies
7676
run: |
7777
conan install . \
7878
--build=missing \
7979
--output-folder=build_codeql \
80-
--settings=build_type=Debug
80+
--settings=build_type=Release
8181
8282
- if: matrix.build-mode == 'manual'
8383
name: Build for CodeQL analysis
8484
run: |
8585
cmake -S . -B build_codeql \
8686
-DCMAKE_TOOLCHAIN_FILE=build_codeql/conan_toolchain.cmake \
87-
-DCMAKE_BUILD_TYPE=Debug
87+
-DCMAKE_BUILD_TYPE=Release
8888
cmake --build build_codeql --target c2pool -j$(nproc)
8989
9090
# ── Analysis ──────────────────────────────────────────────────────────

doc/build-unix.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ The default mode uses embedded LTC and DOGE SPV nodes. No litecoind or
158158
dogecoind installation needed.
159159

160160
```bash
161-
./build/src/c2pool/c2pool --integrated --net litecoin --dashboard-dir web-static
161+
./build/src/c2pool/c2pool --integrated --net litecoin --embedded-ltc --embedded-doge --dashboard-dir web-static
162162
```
163163

164164
- Dashboard: `http://localhost:8080`
@@ -171,6 +171,7 @@ If you run a local litecoind, add it as a priority peer for faster sync:
171171

172172
```bash
173173
./build/src/c2pool/c2pool --integrated --net litecoin \
174+
--embedded-ltc --embedded-doge \
174175
--dashboard-dir web-static \
175176
--coind-p2p-port 9333
176177
```

0 commit comments

Comments
 (0)