Skip to content

Commit 3ec134d

Browse files
Merge branch 'http3-quic-packet-protection' into http3-quic-initial-exchange
2 parents 5c00103 + bb220fd commit 3ec134d

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

.github/workflows/windows_ci_msvc.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,18 @@ jobs:
4141
- name: Install OpenSSL
4242
run: |
4343
choco install openssl -y --no-progress
44-
$opensslBin = 'C:\Program Files\OpenSSL-Win64\bin'
44+
# choco's openssl package (Win64OpenSSL installer under the hood)
45+
# deploys to `C:\Program Files\OpenSSL\`, matching
46+
# ecdsa.c.v/rsa_pss.c.v's SECOND `#flag windows` fallback path --
47+
# NOT the first one (`...OpenSSL-Win64\...`), confirmed by an
48+
# actual CI run after guessing wrong the first time.
49+
$opensslBin = 'C:\Program Files\OpenSSL\bin'
4550
if (-not (Test-Path $opensslBin)) {
4651
throw "OpenSSL bin directory not found at $opensslBin after choco install"
4752
}
4853
Add-Content -Path $env:GITHUB_PATH -Value $opensslBin
4954
Write-Host "OpenSSL install:"
50-
Get-ChildItem 'C:\Program Files\OpenSSL-Win64\lib\VC\x64\MD'
55+
Get-ChildItem 'C:\Program Files\OpenSSL\lib\VC\x64\MD'
5156
- uses: ilammy/msvc-dev-cmd@v1
5257
with:
5358
arch: x64

.github/workflows/windows_ci_tcc.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,18 @@ jobs:
4141
- name: Install OpenSSL
4242
run: |
4343
choco install openssl -y --no-progress
44-
$opensslBin = 'C:\Program Files\OpenSSL-Win64\bin'
44+
# choco's openssl package (Win64OpenSSL installer under the hood)
45+
# deploys to `C:\Program Files\OpenSSL\`, matching
46+
# ecdsa.c.v/rsa_pss.c.v's SECOND `#flag windows` fallback path --
47+
# NOT the first one (`...OpenSSL-Win64\...`), confirmed by an
48+
# actual CI run after guessing wrong the first time.
49+
$opensslBin = 'C:\Program Files\OpenSSL\bin'
4550
if (-not (Test-Path $opensslBin)) {
4651
throw "OpenSSL bin directory not found at $opensslBin after choco install"
4752
}
4853
Add-Content -Path $env:GITHUB_PATH -Value $opensslBin
4954
Write-Host "OpenSSL install:"
50-
Get-ChildItem 'C:\Program Files\OpenSSL-Win64\lib\VC\x64\MD'
55+
Get-ChildItem 'C:\Program Files\OpenSSL\lib\VC\x64\MD'
5156
- name: Build with makev.bat -tcc
5257
run: |
5358
.\makev.bat -tcc

0 commit comments

Comments
 (0)