Commitf01a29a

committed

Remove nif version 2.14 again and tweak the rustler_precompiled settings

1 parent52b9f09 commitf01a29aCopy full SHA for f01a29a

File tree

-14

lines changed

-14

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,8 @@ on:`
`5`	`5`	`branches:`
`6`	`6`	`# Run for pushes to main`
`7`	`7`	`-main`
`8`		`-paths:`
`9`		`-# If files in "native/" change`
`10`		`- -"native/**"`
`11`		`-# Or if this file changes`
`12`		`- -".github/workflows/release.yml"`
`13`	`8`	`tags:`
`14`		`-# Or run for any tag`
	`9`	`+# Or run for anypushedtag`
`15`	`10`	`-"**"`
`16`	`11`
`17`	`12`	`jobs:`
`@@ -21,7 +16,7 @@ jobs:`
`21`	`16`	`strategy:`
`22`	`17`	`fail-fast:false`
`23`	`18`	`matrix:`
`24`		`-nif:["2.14","2.15", "2.16"]`
	`19`	`+nif:["2.16", 2.15"]`
`25`	`20`	`job:`
`26`	`21`	`-{ target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04 , use-cross: true }`
`27`	`22`	`-{ target: aarch64-unknown-linux-gnu , os: ubuntu-20.04 , use-cross: true }`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ defmodule MeeseeksHtml5ever.Native do`
`14`	`14`	`force_build:`
`15`	`15`	`System.get_env("MEESEEKS_HTML5EVER_BUILD")in["1","true"]or`
`16`	`16`	`env_config[:build_from_source],`
	`17`	`+targets:`
	`18`	`+Enum.uniq(["aarch64-unknown-linux-musl"\|RustlerPrecompiled.Config.default_targets()]),`
`17`	`19`	`version:version`
`18`	`20`
`19`	`21`	`defparse_html(_binary),do:err()`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`		`-[profile.release]`
`2`		`-lto = true`
`3`		`-`
`4`	`1`	`[target.x86_64-apple-darwin]`
`5`	`2`	`rustflags = [`
`6`	`3`	`"-C", "link-arg=-undefined",`
`@@ -13,9 +10,6 @@ rustflags = [`
`13`	`10`	`"-C", "link-arg=dynamic_lookup",`
`14`	`11`	`]`
`15`	`12`
`16`		`-[target.arm-unknown-linux-gnueabihf]`
`17`		`-linker = "arm-linux-gnueabihf-gcc"`
`18`		`-`
`19`	`13`	`# See https://github.com/rust-lang/rust/issues/59302`
`20`	`14`	`[target.x86_64-unknown-linux-musl]`
`21`	`15`	`rustflags = [`
`@@ -26,4 +20,7 @@ rustflags = [`
`26`	`20`	`[target.aarch64-unknown-linux-musl]`
`27`	`21`	`rustflags = [`
`28`	`22`	`"-C", "target-feature=-crt-static"`
`29`		`-]`
	`23`	`+]`
	`24`	`+`
	`25`	`+[profile.release]`
	`26`	`+lto = true`

Comments

(0)