Skip to content

Commit f01a29a

Browse files
committed
Remove nif version 2.14 again and tweak the rustler_precompiled settings
1 parent 52b9f09 commit f01a29a

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ on:
55
branches:
66
# Run for pushes to main
77
- main
8-
paths:
9-
# If files in "native/" change
10-
- "native/**"
11-
# Or if this file changes
12-
- ".github/workflows/release.yml"
138
tags:
14-
# Or run for any tag
9+
# Or run for any pushed tag
1510
- "**"
1611

1712
jobs:
@@ -21,7 +16,7 @@ jobs:
2116
strategy:
2217
fail-fast: false
2318
matrix:
24-
nif: ["2.14", "2.15", "2.16"]
19+
nif: ["2.16", 2.15"]
2520
job:
2621
- { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04 , use-cross: true }
2722
- { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04 , use-cross: true }

lib/meeseeks_html5ever/native.ex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ defmodule MeeseeksHtml5ever.Native do
1414
force_build:
1515
System.get_env("MEESEEKS_HTML5EVER_BUILD") in ["1", "true"] or
1616
env_config[:build_from_source],
17+
targets:
18+
Enum.uniq(["aarch64-unknown-linux-musl" | RustlerPrecompiled.Config.default_targets()]),
1719
version: version
1820

1921
def parse_html(_binary), do: err()

native/meeseeks_html5ever_nif/.cargo/config

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[profile.release]
2-
lto = true
3-
41
[target.x86_64-apple-darwin]
52
rustflags = [
63
"-C", "link-arg=-undefined",
@@ -13,9 +10,6 @@ rustflags = [
1310
"-C", "link-arg=dynamic_lookup",
1411
]
1512

16-
[target.arm-unknown-linux-gnueabihf]
17-
linker = "arm-linux-gnueabihf-gcc"
18-
1913
# See https://github.com/rust-lang/rust/issues/59302
2014
[target.x86_64-unknown-linux-musl]
2115
rustflags = [
@@ -26,4 +20,7 @@ rustflags = [
2620
[target.aarch64-unknown-linux-musl]
2721
rustflags = [
2822
"-C", "target-feature=-crt-static"
29-
]
23+
]
24+
25+
[profile.release]
26+
lto = true

0 commit comments

Comments
 (0)