Skip to content

Commit

Permalink
Merge pull request #193 from djc/updates
Browse files Browse the repository at this point in the history
Update html5ever to 0.27
  • Loading branch information
notriddle authored Mar 25, 2024
2 parents f3796d8 + 6228bda commit ba0e263
Show file tree
Hide file tree
Showing 5 changed files with 360 additions and 327 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
rust: ["1.66.0", "stable", "beta"]
rust: ["stable", "beta"]
build_flags: ["", "--cfg ammonia_unstable"]
os: [ubuntu-latest]
steps:
Expand All @@ -28,11 +28,29 @@ jobs:
env:
RUSTFLAGS: ${{ matrix.build_flags }}

msrv:
name: MSRV
runs-on: ubuntu-latest
strategy:
matrix:
build_flags: ["", "--cfg ammonia_unstable"]
steps:
- uses: actions/checkout@master
- name: Set toolchain
run: |
rustup set profile minimal
rustup override set 1.60.0
- name: Check
run: cargo check --lib --all-features
env:
RUSTFLAGS: ${{ matrix.build_flags }}

ci-success:
name: ci
if: ${{ success() }}
needs:
- test
- msrv
runs-on: ubuntu-latest
steps:
- name: CI succeeded
Expand Down
7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ readme = "README.md"
documentation = "https://docs.rs/ammonia/"
repository = "https://github.com/rust-ammonia/ammonia"
categories = [ "web-programming", "text-processing" ]
edition = "2018"
edition = "2021"
rust-version = "1.60"

[dependencies]
html5ever = "0.26"
html5ever = "0.27"
maplit = "1.0"
tendril = "0.4"
url = "2"
once_cell = "1.10"

[dev-dependencies]
version-sync = "0.9"
env_logger = "0.10"
env_logger = "0.10" # env_logger 0.11 requires MSRV 1.70 even for a dev-dep due to Cargo metadata
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ HTML Sanitization
=================

[![Crates.IO](https://img.shields.io/crates/v/ammonia.svg)](https://crates.io/crates/ammonia)
![Requires rustc 1.60.0](https://img.shields.io/badge/rustc-1.66.0+-green.svg)
![Requires rustc 1.60.0](https://img.shields.io/badge/rustc-1.60.0+-green.svg)

Ammonia is a whitelist-based HTML sanitization library. It is designed to
prevent cross-site scripting, layout breaking, and clickjacking caused
Expand Down
Loading

0 comments on commit ba0e263

Please sign in to comment.