From 5a547ec068db159358d6afbdc685a1a67ef81cda Mon Sep 17 00:00:00 2001 From: Philip Sampaio Date: Tue, 23 May 2023 14:02:34 -0300 Subject: [PATCH 1/4] Update some crates and make compatible with OTP 26 We need the "rustler-sys" update in order to run on OTP 26. --- mix.exs | 2 +- native/html5ever_nif/Cargo.lock | 42 ++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mix.exs b/mix.exs index 0d9e204..bab89d9 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Html5ever.Mixfile do use Mix.Project - @version "0.14.2" + @version "0.14.3-dev" @repo_url "https://github.com/rusterlium/html5ever_elixir" def project do diff --git a/native/html5ever_nif/Cargo.lock b/native/html5ever_nif/Cargo.lock index 0499d90..97bfba8 100644 --- a/native/html5ever_nif/Cargo.lock +++ b/native/html5ever_nif/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -89,9 +89,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "lock_api" @@ -225,18 +225,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -282,9 +282,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" dependencies = [ "aho-corasick", "memchr", @@ -293,9 +293,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rustler" @@ -317,14 +317,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "rustler_sys" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff26a42e62d538f82913dd34f60105ecfdffbdb25abdc3c3580b0c622285332" +checksum = "ae0eb19e2fdf4abc3662441087fc499a58b7550822cc8007e79f15c40157c883" dependencies = [ "regex", "unreachable", @@ -338,9 +338,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" [[package]] name = "siphasher" @@ -393,9 +393,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", From ef64674418041b5e0c654116c5f77a1486042c10 Mon Sep 17 00:00:00 2001 From: Philip Sampaio Date: Fri, 26 May 2023 15:20:38 -0300 Subject: [PATCH 2/4] Test using OTP 26 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67f5813..1dd36f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: otp: 23.3.4 - pair: elixir: 1.14.3 - otp: 25.2.1 + otp: "26.0" lint: lint steps: - uses: actions/checkout@v3 From 32124efa2cba412b31f3906afe672819519ca3b5 Mon Sep 17 00:00:00 2001 From: Philip Sampaio Date: Fri, 26 May 2023 15:37:18 -0300 Subject: [PATCH 3/4] Fix version of Elixir to run with OTP 26 Also include riscv target in the precompilation list. --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1dd36f8..bf84557 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: elixir: 1.11.4 otp: 23.3.4 - pair: - elixir: 1.14.3 + elixir: 1.14.5 otp: "26.0" lint: lint steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f6d4ca..86e2588 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,7 @@ jobs: - { target: aarch64-unknown-linux-musl , os: ubuntu-20.04 , use-cross: true } - { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04 , use-cross: true } - { target: aarch64-apple-darwin , os: macos-11 } + - { target: riscv64gc-unknown-linux-gnu , os: ubuntu-20.04 , use-cross: true } - { target: x86_64-apple-darwin , os: macos-11 } - { target: x86_64-unknown-linux-gnu , os: ubuntu-20.04 } - { target: x86_64-unknown-linux-musl , os: ubuntu-20.04 , use-cross: true } From de850937c2f7976bc13d328fb4160d6c950bb417 Mon Sep 17 00:00:00 2001 From: Philip Sampaio Date: Fri, 26 May 2023 15:59:56 -0300 Subject: [PATCH 4/4] Release v0.14.3 --- CHANGELOG.md | 15 ++++++++++++++- mix.exs | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99b6011..0e6a49d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.14.3] - 2023-05-26 + +### Added + +- Add precompilation target for Linux running on RISC-V 64 bits machines. + This is useful for projects using Nerves. + + Note that this is going to require `rustler_precompiled` v0.6 or above, since + the that version includes RISC-V on Linux as defaults. + +- Add support for OTP 26 by updating the `rustler-sys` package. + ## [0.14.2] - 2023-05-20 ### Added @@ -122,7 +134,8 @@ is not needed for most of people using this project. - Add support for OTP 24. This was achieved by updating Rustler to v0.22. -[Unreleased]: https://github.com/rusterlium/html5ever_elixir/compare/v0.14.2...HEAD +[Unreleased]: https://github.com/rusterlium/html5ever_elixir/compare/v0.14.3...HEAD +[0.14.3]: https://github.com/rusterlium/html5ever_elixir/compare/v0.14.2...v0.14.3 [0.14.2]: https://github.com/rusterlium/html5ever_elixir/compare/v0.14.1...v0.14.2 [0.14.1]: https://github.com/rusterlium/html5ever_elixir/compare/v0.14.0...v0.14.1 [0.14.0]: https://github.com/rusterlium/html5ever_elixir/compare/v0.13.1...v0.14.0 diff --git a/mix.exs b/mix.exs index bab89d9..a7804e6 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Html5ever.Mixfile do use Mix.Project - @version "0.14.3-dev" + @version "0.14.3" @repo_url "https://github.com/rusterlium/html5ever_elixir" def project do