Skip to content

Commit f694dda

Browse files
authored
feat(ci): Clarify hdf5 src license and fix hermes related CI issues (#400)
* fix(python): Python Lints. * fix(python): Fix comment in Justfile * fix(python): spelling fixes * fix(python): Remove subprocess._ENV it doesn't exist... * fix(python): name named parameters * fix(python): Name non positional parameters * fix(python): disable lints for print * fix(python): fix more bool flags * fix(python): Its ok if the docs dir exists * fix(python): bin was renamed to bin_file * fix(python): filename needs to be a string not a path * fix(python): Make `indent` default to 0, not None. * fix(python): Use relative includes for files in sub directories. * docs(python): Update mkdocs and fix relative includes. * fix(python): Bump to python 13 * fix(python): update dependencies as it no longer builds * fix(python): update docs * fix(python): add UV to base python builder * fix(python): Add UV to the path * feat(rust): clarify the license for hdf5-metno-src * fix(rust): change license path * fix(rust): try a different license file * fix(rust): replace original hdf5-src license clarification * fix: sync wit-bindgen with hermes requirements \ * fix(rust): deny.toml updated in rust example * fix(rust): try wit-bingen 0.20 * fix(rust): try wit bingen 0.32 again * fix(rust): try wit-bindgen 0.24.0 * fix(rust): try wit-bindgen 0.25,0 * fix(rust): try wit-bindgen 0.26.0 * fix(rust): try wit-bindgen 0.27.0 * fix(rust): try wit-bindgen 0.28.0 * fix(rust): cargo bench didnt seperate arguments properly * fix(rust): See if wit-bindgen 0.29.0 works * fix: remove obsolete comment
1 parent 973e301 commit f694dda

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.config/dictionaries/project.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ lintfix
7575
markdownlint
7676
mattn
7777
mdlint
78+
metno
7879
mithril
7980
mkdocs
8081
modcache

earthly/rust/scripts/std_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def cargo_llvm_cov(flags: str, cov_report: str, *, verbose: bool = False) -> lis
8888
def cargo_bench(flags: str, *, verbose: bool = False) -> exec_manager.Result:
8989
"""Cargo Bench."""
9090
return exec_manager.cli_run(
91-
"cargo bench --all-targets --no-fail-fast" + f"{flags} ",
91+
f"cargo bench --all-targets --no-fail-fast {flags} ",
9292
name="Benchmarks all run to completion check",
9393
verbose=verbose,
9494
)

earthly/rust/stdcfgs/deny.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,16 @@ expression = "Apache-2.0 WITH LLVM-exception"
9494
license-files = [{ path = "../../../LICENSE", hash = 0x001c7e6c }]
9595

9696
[[licenses.clarify]]
97-
crate = "hdf5-src"
97+
crate = "hdf5-metno-src"
9898
expression = "MIT"
99-
license-files = [{ path = "../LICENSE-MIT", hash = 0x001c7e6c }]
99+
license-files = [{ path = "ext/hdf5/COPYING", hash = 0xf13e3591 }]
100100

101101
[[licenses.clarify]]
102102
crate = "ring"
103103
expression = "MIT"
104104
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
105105

106+
106107
# SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses
107108
# https://spdx.org/licenses/OpenSSL.html
108109
# ISC - Both BoringSSL and ring use this for their new files

earthly/rust/tools/Earthfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ tool-wasm-tools:
7070
tool-cargo-expand:
7171
DO +CARGO_BINSTALL --package=cargo-expand --version=1.0.90
7272

73+
# Should align with our wit-bindgen library, but doesn't currently or it fails to build.
74+
# DO NOT change the version without testing that hermes targets all build correctly with the updated tool.
7375
tool-wit-bindgen:
74-
DO +CARGO_BINSTALL --package=wit-bindgen-cli --version=0.32.0 --executable="wit-bindgen" --test_param="-V"
76+
DO +CARGO_BINSTALL --package=wit-bindgen-cli --version=0.29.0 --executable="wit-bindgen" --test_param="-V"
7577

7678
# We build cargo-sweep tooling for the rust library so that its not rebuilt for every target.
7779
tool-cargo-sweep:

examples/rust/deny.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ expression = "Apache-2.0 WITH LLVM-exception"
9494
license-files = [{ path = "../../../LICENSE", hash = 0x001c7e6c }]
9595

9696
[[licenses.clarify]]
97-
crate = "hdf5-src"
97+
crate = "hdf5-metno-src"
9898
expression = "MIT"
99-
license-files = [{ path = "../LICENSE-MIT", hash = 0x001c7e6c }]
99+
license-files = [{ path = "ext/hdf5/COPYING", hash = 0xf13e3591 }]
100100

101101
[[licenses.clarify]]
102102
crate = "ring"

0 commit comments

Comments
 (0)