From 75d14fba829eef5c25e4be8e851aaf8e03cc8905 Mon Sep 17 00:00:00 2001 From: Pi-Cla Date: Sat, 4 May 2024 16:48:48 -0600 Subject: [PATCH] Bump hexpm to re-enable aarch64-unknown-linux-gnu Bumping hexpm also bumps ring so that we no longer depend on the older version of ring that was causing aarch64 to fail --- .github/workflows/ci.yaml | 11 ++-- Cargo.lock | 117 ++++++++++++++++++++++++-------------- Cargo.toml | 3 + compiler-wasm/Cargo.toml | 1 + 4 files changed, 82 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2d88e371cb0..d8eccd7fcfc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,8 +33,7 @@ jobs: target: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl - # https://github.com/gleam-lang/gleam/issues/2221 - # - aarch64-unknown-linux-gnu + - aarch64-unknown-linux-gnu - aarch64-unknown-linux-musl - x86_64-apple-darwin - x86_64-pc-windows-msvc @@ -47,10 +46,10 @@ jobs: target: x86_64-unknown-linux-musl use-cross: true run-integration-tests: true - # - os: ubuntu-latest - # target: aarch64-unknown-linux-gnu - # use-cross: true - # run-integration-tests: false # Cannot run aarch64 binaries on x86_64 + - os: ubuntu-latest + target: aarch64-unknown-linux-gnu + use-cross: true + run-integration-tests: false # Cannot run aarch64 binaries on x86_64 - os: ubuntu-latest target: aarch64-unknown-linux-musl use-cross: true diff --git a/Cargo.lock b/Cargo.lock index 2a837f52ad0..e12c57fdd00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,6 +74,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + [[package]] name = "askama" version = "0.12.1" @@ -782,8 +788,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -896,6 +904,7 @@ version = "1.1.0" dependencies = [ "camino", "console_error_panic_hook", + "getrandom", "gleam-core", "hexpm", "im", @@ -955,9 +964,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hexpm" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfa9bb3a9a3f093c93ede0780fa3ab70d45a544423ba9356aa473c5a82c4fc3" +checksum = "37762aa95b4b16acae5732f51881d0384dca5f059d04b9a60089fc8019f43046" dependencies = [ "base16", "bytes", @@ -966,10 +975,10 @@ dependencies = [ "http-auth-basic", "lazy_static", "protobuf", - "protobuf-codegen-pure", + "protobuf-codegen", "pubgrub", "regex", - "ring 0.16.20", + "ring", "serde", "serde_json", "thiserror", @@ -977,6 +986,15 @@ dependencies = [ "x509-parser", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hostname" version = "0.4.0" @@ -1590,27 +1608,53 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.28.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" +dependencies = [ + "once_cell", + "protobuf-support", + "thiserror", +] [[package]] name = "protobuf-codegen" -version = "2.28.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" +checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77" dependencies = [ + "anyhow", + "once_cell", "protobuf", + "protobuf-parse", + "regex", + "tempfile", + "thiserror", ] [[package]] -name = "protobuf-codegen-pure" -version = "2.28.0" +name = "protobuf-parse" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865" +checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642" dependencies = [ + "anyhow", + "indexmap 1.9.3", + "log", "protobuf", - "protobuf-codegen", + "protobuf-support", + "tempfile", + "thiserror", + "which", +] + +[[package]] +name = "protobuf-support" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" +dependencies = [ + "thiserror", ] [[package]] @@ -1794,21 +1838,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -1819,8 +1848,8 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] @@ -1886,7 +1915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -1915,9 +1944,9 @@ version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -2088,12 +2117,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -2533,12 +2556,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -2718,6 +2735,18 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 57724564f15..7d934a6a47d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,3 +58,6 @@ thiserror = "1" pretty_assertions = "1" # Snapshot testing to make test maintenance easier insta = "1" +# A transitive dependency needed to compile into wasm32-unknown-unknown +# See https://docs.rs/getrandom/latest/getrandom/index.html#webassembly-support +getrandom = { version = "0", features = ["js"] } \ No newline at end of file diff --git a/compiler-wasm/Cargo.toml b/compiler-wasm/Cargo.toml index d792a4ed598..79c4ea8b514 100644 --- a/compiler-wasm/Cargo.toml +++ b/compiler-wasm/Cargo.toml @@ -22,6 +22,7 @@ itertools.workspace = true serde.workspace = true termcolor.workspace = true tracing.workspace = true +getrandom.workspace = true [dev-dependencies] wasm-bindgen-test = "0.3.42"