Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(download/rustls): use aws-lc instead of ring #3898

Merged
merged 1 commit into from
Aug 1, 2024
Merged

feat(download/rustls): use aws-lc instead of ring #3898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ jobs:
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
shell: powershell
- name: Install NASM
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
uses: ilammy/setup-nasm@v1
if: matrix.mingwdir == ''
- name: Install mingw
uses: bwoodsend/setup-winlibs-action@v1
if: matrix.mingwdir != ''
Expand Down Expand Up @@ -220,6 +225,11 @@ jobs:
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
shell: powershell
- name: Install NASM
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
uses: ilammy/setup-nasm@v1
if: matrix.mingwdir == ''
- name: Install mingw
uses: bwoodsend/setup-winlibs-action@v1
if: matrix.mingwdir != ''
Expand Down Expand Up @@ -384,6 +394,11 @@ jobs:
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
shell: powershell
- name: Install NASM
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
uses: ilammy/setup-nasm@v1
if: matrix.mingwdir == ''
- name: Install mingw
uses: bwoodsend/setup-winlibs-action@v1
if: matrix.mingwdir != ''
Expand Down Expand Up @@ -1447,6 +1462,11 @@ jobs:
echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
- name: Install NASM
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
uses: ilammy/setup-nasm@v1
if: ${{ contains(matrix.os, 'windows') }}
- name: Set environment variables appropriately for the build
shell: bash
run: |
Expand Down
187 changes: 184 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ci/actions-templates/all-features-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ jobs: # skip-all
echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
- name: Install NASM
# Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
# See: https://aws.github.io/aws-lc-rs/requirements/windows.html
uses: ilammy/setup-nasm@v1
if: ${{ contains(matrix.os, 'windows') }}
- name: Set environment variables appropriately for the build
shell: bash
run: |
Expand Down
Loading
Loading