Skip to content

Commit 9f4736e

Browse files
committed
feat(download/rustls): use aws-lc instead of ring
1 parent 796be02 commit 9f4736e

File tree

20 files changed

+302
-6
lines changed

20 files changed

+302
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ jobs:
6262
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
6363
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
6464
shell: powershell
65+
- name: Install NASM
66+
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
67+
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
68+
uses: ilammy/setup-nasm@v1
69+
if: matrix.mingwdir == ''
6570
- name: Install mingw
6671
uses: bwoodsend/setup-winlibs-action@v1
6772
if: matrix.mingwdir != ''
@@ -220,6 +225,11 @@ jobs:
220225
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
221226
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
222227
shell: powershell
228+
- name: Install NASM
229+
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
230+
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
231+
uses: ilammy/setup-nasm@v1
232+
if: matrix.mingwdir == ''
223233
- name: Install mingw
224234
uses: bwoodsend/setup-winlibs-action@v1
225235
if: matrix.mingwdir != ''
@@ -384,6 +394,11 @@ jobs:
384394
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
385395
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
386396
shell: powershell
397+
- name: Install NASM
398+
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
399+
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
400+
uses: ilammy/setup-nasm@v1
401+
if: matrix.mingwdir == ''
387402
- name: Install mingw
388403
uses: bwoodsend/setup-winlibs-action@v1
389404
if: matrix.mingwdir != ''
@@ -1447,6 +1462,11 @@ jobs:
14471462
echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
14481463
echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
14491464
echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
1465+
- name: Install NASM
1466+
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
1467+
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
1468+
uses: ilammy/setup-nasm@v1
1469+
if: ${{ contains(matrix.os, 'windows') }}
14501470
- name: Set environment variables appropriately for the build
14511471
shell: bash
14521472
run: |

Cargo.lock

Lines changed: 184 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/actions-templates/all-features-template.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs: # skip-all
3838
echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
3939
echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
4040
echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
41+
- name: Install NASM
42+
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
43+
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
44+
uses: ilammy/setup-nasm@v1
45+
if: ${{ contains(matrix.os, 'windows') }}
4146
- name: Set environment variables appropriately for the build
4247
shell: bash
4348
run: |

0 commit comments

Comments
 (0)