From 72940cc14f81da053586e53fc579155416874599 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Wed, 13 Mar 2024 14:05:42 -0500
Subject: [PATCH] Remove NASM from CI

---
 .github/workflows/main.yml    | 6 ------
 .github/workflows/merge.yml   | 1 -
 .github/workflows/publish.yml | 2 --
 Cargo.toml                    | 5 ++---
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1fb7ca86b..af95c5e02 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,7 +53,6 @@ jobs:
         with:
           cache-all-crates: "true"
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: ilammy/setup-nasm@v1
       - run: cargo check --all --examples --tests --all-features --all-targets
 
   test:
@@ -69,7 +68,6 @@ jobs:
         with:
           cache-all-crates: "true"
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: ilammy/setup-nasm@v1
       - uses: davidB/rust-cargo-make@v1
       - uses: browser-actions/setup-firefox@latest
       - uses: jetli/wasm-pack-action@v0.4.0
@@ -87,7 +85,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ilammy/setup-nasm@v1
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
@@ -105,7 +102,6 @@ jobs:
       - uses: actions/checkout@v4
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
-      - uses: ilammy/setup-nasm@v1
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
@@ -149,7 +145,6 @@ jobs:
     steps:
       # Do our best to cache the toolchain and node install steps
       - uses: actions/checkout@v4
-      - uses: ilammy/setup-nasm@v1
       - uses: actions/setup-node@v4
         with:
           node-version: 16
@@ -235,7 +230,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: ilammy/setup-nasm@v1
       - name: install stable
         uses: dtolnay/rust-toolchain@master
         with:
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 13e3a8afd..e2e91f4f5 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -48,7 +48,6 @@ jobs:
         with:
           cache-all-crates: "true"
           save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: ilammy/setup-nasm@v1
 
       - name: cargo doc
         run: cargo doc --no-deps --workspace --all-features
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 972a5b573..04a8aedff 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -54,7 +54,6 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-all-crates: "true"
-      - uses: ilammy/setup-nasm@v1
 
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@v1.3.1
@@ -123,7 +122,6 @@ jobs:
           toolchain: "1.70.0"
           targets: ${{ matrix.platform.target }}
 
-      - uses: ilammy/setup-nasm@v1
 
       - name: Setup cache
         uses: Swatinem/rust-cache@v2
diff --git a/Cargo.toml b/Cargo.toml
index e603b3aff..71f4875c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,11 +100,10 @@ thiserror = "1.0.40"
 prettyplease = { package = "prettier-please", version = "0.2", features = [
     "verbatim",
 ] }
-manganis-cli-support = { version = "0.2.0", features = [
-    "webp",
+manganis-cli-support = { version = "0.2.1", features = [
     "html",
 ] }
-manganis = { version = "0.2.0" }
+manganis = { version = "0.2.1" }
 
 lru = "0.12.2"
 async-trait = "0.1.77"