Merge BlockstreamResearch/secp256k1-zkp#363: Upstream PRs 1846, 1848, 1849
8479eafa57musig: always clear out secret key in `secp256k1_musig_nonce_gen_counter` (Sebastian Falbesoner)3cca6451a2ci: Bump GCC snapshot major version to 17 (Hennadii Stepanov)285cb788e9ci: Replace `ilammy/msvc-dev-cmd` with manual MSVC setup (Hennadii Stepanov) Pull request description: This PR has been created by a GitHub Actions workflow without human involvement. [bitcoin-core/secp256k1#1846]: ci: Replace `ilammy/msvc-dev-cmd` with manual MSVC setup [bitcoin-core/secp256k1#1848]: ci: Bump GCC snapshot major version to 17 [bitcoin-core/secp256k1#1849]: musig: always clear out secret key in `secp256k1_musig_nonce_gen_counter` Tips: * Use `git show --remerge-diff <pr-branch>` to show the conflict resolution in the merge commit. * Use `git read-tree --reset -u <pr-branch>` to replay these resolutions during the conflict resolution stage when recreating the PR branch locally. Be aware that this may discard your index as well as the uncommitted changes and untracked files in your worktree. ACKs for top commit: mllwchrry: ACKb11340b. This sync PR can be merged as-is. DarkWindman: ACKb11340b3ceTree-SHA512: 4b311e9bfa21f00b4780202c08af9d00380f5b3df40704641764d706cfc3408615b6206c7c82ca915b56c27a354bdf24680674269a28eefe7d4e93adc06cbaa5
This commit is contained in:
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
@@ -693,11 +693,10 @@ jobs:
|
||||
steps:
|
||||
- *CHECKOUT
|
||||
|
||||
- name: Add cl.exe to PATH
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
|
||||
- name: C++ (public headers)
|
||||
shell: cmd
|
||||
run: |
|
||||
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
cl.exe -c -WX -TP include/*.h
|
||||
|
||||
cxx_fpermissive_debian:
|
||||
|
||||
Reference in New Issue
Block a user