Skip to content

Commit c96b596

Browse files
committed
ci(windows/msvc): install nasm for aws-lc
1 parent 3fb49b7 commit c96b596

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

.github/workflows/ci.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ 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+
uses: ilammy/setup-nasm@v1
67+
if: matrix.mingwdir == ''
6568
- name: Install mingw
6669
uses: bwoodsend/setup-winlibs-action@v1
6770
if: matrix.mingwdir != ''
@@ -220,6 +223,9 @@ jobs:
220223
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
221224
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
222225
shell: powershell
226+
- name: Install NASM
227+
uses: ilammy/setup-nasm@v1
228+
if: matrix.mingwdir == ''
223229
- name: Install mingw
224230
uses: bwoodsend/setup-winlibs-action@v1
225231
if: matrix.mingwdir != ''
@@ -384,6 +390,9 @@ jobs:
384390
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
385391
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
386392
shell: powershell
393+
- name: Install NASM
394+
uses: ilammy/setup-nasm@v1
395+
if: matrix.mingwdir == ''
387396
- name: Install mingw
388397
uses: bwoodsend/setup-winlibs-action@v1
389398
if: matrix.mingwdir != ''
@@ -1447,6 +1456,9 @@ jobs:
14471456
echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
14481457
echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
14491458
echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
1459+
- name: Install NASM
1460+
uses: ilammy/setup-nasm@v1
1461+
if: ${{ contains(matrix.os, 'windows') }}
14501462
- name: Set environment variables appropriately for the build
14511463
shell: bash
14521464
run: |

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ 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+
uses: ilammy/setup-nasm@v1
43+
if: ${{ contains(matrix.os, 'windows') }}
4144
- name: Set environment variables appropriately for the build
4245
shell: bash
4346
run: |

ci/actions-templates/windows-builds-template.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs: # skip-master skip-pr skip-stable
5555
New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
5656
New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
5757
shell: powershell
58+
- name: Install NASM
59+
uses: ilammy/setup-nasm@v1
60+
if: matrix.mingwdir == ''
5861
- name: Install mingw
5962
uses: bwoodsend/setup-winlibs-action@v1
6063
if: matrix.mingwdir != ''

0 commit comments

Comments
 (0)