Browse Source

Remove NASM from CI

Evan Almloff 1 year ago
parent
commit
72940cc14f
4 changed files with 2 additions and 12 deletions
  1. 0 6
      .github/workflows/main.yml
  2. 0 1
      .github/workflows/merge.yml
  3. 0 2
      .github/workflows/publish.yml
  4. 2 3
      Cargo.toml

+ 0 - 6
.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:

+ 0 - 1
.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

+ 0 - 2
.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

+ 2 - 3
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"