CI: Use ilammy/setup-nasm@v1 to install nasm

Replaces the proprietary script
barrbrain · Dec 28, 2020 · f3304b0 · f3304b0
1 parent 2fc09c1
commit f3304b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -30,14 +30,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-
-    - name: Install nasm
-      run: |
-        $NASM_VERSION="2.15.05"
-        $LINK="https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/win64"
-        curl --ssl-no-revoke -LO "$LINK/nasm-$NASM_VERSION-win64.zip"
-        7z e -y "nasm-$NASM_VERSION-win64.zip" -o"C:\nasm"
-        echo "C:\nasm" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+    - uses: ilammy/setup-nasm@v1
 
     - name: Install cargo-c
       run: |

diff --git a/.github/workflows/rav1e.yml b/.github/workflows/rav1e.yml
@@ -19,16 +19,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Install nasm
-      env:
-        LINK: http://debian-archive.trafficmanager.net/debian/pool/main/n/nasm
-        NASM_VERSION: 2.15.05-1
-        NASM_SHA256: >-
-          c860caec653b865d5b83359452d97b11f1b3ba5b18b07cac554cf72550b3bfc9
-      run: |
-        curl -O "$LINK/nasm_${NASM_VERSION}_amd64.deb"
-        echo "$NASM_SHA256 nasm_${NASM_VERSION}_amd64.deb" | sha256sum --check
-        sudo dpkg -i "nasm_${NASM_VERSION}_amd64.deb"
+    - uses: ilammy/setup-nasm@v1
     - name: Install stable
       uses: actions-rs/toolchain@v1
       with: