Skip to content

Commit

Permalink
CI: Update nasm to 2.15.04
Browse files Browse the repository at this point in the history
Note that homebrew has moved on to 2.14.05 already.
  • Loading branch information
barrbrain committed Aug 30, 2020
1 parent 6bf1ad6 commit f3b1c58
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Install nasm
run: |
$NASM_VERSION="2.15.02"
$NASM_VERSION="2.15.04"
$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"
Expand Down Expand Up @@ -150,9 +150,9 @@ jobs:
if: matrix.target == 'x86_64-unknown-linux-musl'
env:
LINK: http://debian-archive.trafficmanager.net/debian/pool/main/n/nasm
NASM_VERSION: 2.15.02-1+b1
NASM_VERSION: 2.15.04-1
NASM_SHA256: >-
b454c064732c046ba025b82549833b3892ce85f2812d3addb8cbb06c6a47da8e
7801f43bc3bce0fba50ecaaa9f5bd337708b5d2335b20feecf52ed6f15e188d2
run: |
curl -O "$LINK/nasm_${NASM_VERSION}_amd64.deb"
echo "$NASM_SHA256 nasm_${NASM_VERSION}_amd64.deb" | sha256sum --check
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rav1e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- name: Install nasm
env:
LINK: http://debian-archive.trafficmanager.net/debian/pool/main/n/nasm
NASM_VERSION: 2.15.02-1+b1
NASM_VERSION: 2.15.04-1
NASM_SHA256: >-
b454c064732c046ba025b82549833b3892ce85f2812d3addb8cbb06c6a47da8e
7801f43bc3bce0fba50ecaaa9f5bd337708b5d2335b20feecf52ed6f15e188d2
run: |
curl -O "$LINK/nasm_${NASM_VERSION}_amd64.deb"
echo "$NASM_SHA256 nasm_${NASM_VERSION}_amd64.deb" | sha256sum --check
Expand Down Expand Up @@ -114,9 +114,9 @@ jobs:
- name: Add nasm
env:
LINK: http://debian-archive.trafficmanager.net/debian/pool/main/n/nasm
NASM_VERSION: 2.15.02-1+b1
NASM_VERSION: 2.15.04-1
NASM_SHA256: >-
b454c064732c046ba025b82549833b3892ce85f2812d3addb8cbb06c6a47da8e
7801f43bc3bce0fba50ecaaa9f5bd337708b5d2335b20feecf52ed6f15e188d2
run: |
echo "$LINK/nasm_${NASM_VERSION}_amd64.deb" >> DEBS
echo "$NASM_SHA256 nasm_${NASM_VERSION}_amd64.deb" >> CHECKSUMS
Expand Down Expand Up @@ -409,7 +409,7 @@ jobs:
echo "::add-path::$Env:GITHUB_WORKSPACE/$SCCACHE_FILE"
- name: Install nasm
run: |
$NASM_VERSION="2.15.02"
$NASM_VERSION="2.15.04"
$LINK = "https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/win64"
$NASM_FILE = "nasm-$NASM_VERSION-win64"
curl --ssl-no-revoke -LO "$LINK/$NASM_FILE.zip"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ For the foreseeable future, a weekly pre-release of rav1e will be [published](ht
### Dependency: NASM
Some `x86_64`-specific optimizations require [NASM](https://nasm.us/) `2.14.02` or newer and are enabled by default.

The CI is testing against `nasm 2.15.02`, so bugs for other versions might happen. If you find one please open an issue!
The CI is testing against `nasm 2.15.04`, so bugs for other versions might happen. If you find one please open an issue!

<details>
<summary>
Expand All @@ -72,17 +72,17 @@ sudo ln /usr/lib/nasm-mozilla/bin/nasm /usr/local/bin/
```sh
sudo dnf install nasm
```
**windows** (`nasm 2.15.02`) <br/>
**windows** (`nasm 2.15.04`) <br/>
Have a [NASM binary](https://www.nasm.us/pub/nasm/releasebuilds/) in your system PATH.
```sh
$NASM_VERSION="2.15.02" # or newer
$NASM_VERSION="2.15.04" # or newer
$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"
# set path for the current sessions
set PATH="%PATH%;C:\nasm"
```
**macOS** (`nasm 2.15.02`)
**macOS** (`nasm 2.15.05`)
```sh
brew install nasm
```
Expand Down

0 comments on commit f3b1c58

Please sign in to comment.