Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream 3.1.56 #761

Draft
wants to merge 80 commits into
base: main
Choose a base branch
from
Draft

Merge upstream 3.1.56 #761

wants to merge 80 commits into from

Conversation

radekdoulik
Copy link
Member

No description provided.

sbc100 and others added 30 commits March 15, 2023 09:34
@sbc100
Update arm64 linux release (emscripten-core#1204)
a2ccccb 
Fixes: emscripten-core#1202
@robbertvanginkel
Add linux/arm64 support to bazel rules (emscripten-core#1156)
04944dd 
* Add linux/arm64 support to bazel rules

* Make linux arm64 sha optional and PR feedback

Not all releases have linux shas. Use getattr to default to no sha if none was
present. This way non linux arm64 builds should not fail.

* Update linux arm64 sha for 3.1.33

This is the latest arm64 release according to emscripten-core#1204. There do not seem to be a any releases between .21 and .33.
@dschuff
3.1.35 (emscripten-core#1208)
886a44a
@sbc100
Add activated_path_skip to node v14.18.2 packages (emscripten-core#…
22ede2d 
…1209)

This should have been part of emscripten-core#1189.  See emscripten-core#1183.
@sbc100
Update node version 14.15.5 -> 15.14.0 (emscripten-core#829)
dd8bbe5
@sbc100
3.1.36 (emscripten-core#1210)
da96998
@sbc100
3.1.37 (emscripten-core#1212)
b113f24
@sbc100
3.1.38 (emscripten-core#1215)
0329dba
@dschuff
3.1.39 (emscripten-core#1217)
e8b6477
@dschuff
3.1.40 (emscripten-core#1221)
ae24571
@dschuff
Update mac builders to use Circle's gen2 mac runner (emscripten-core#…
4b47cbf 
…1222)

This runner is faster and more efficient.
Also factor the mac configuration into an executor.
@pnacht
Add security policy (emscripten-core#1224)
3009d69 
Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
@kleisauke
Docker: remove remnant of fastcomp (emscripten-core#1226)
5753939 
The fastcomp backend was removed in Emscripten v2.0.0.
@kleisauke
Docker: remove redundant EMSDK_NODE env (emscripten-core#1225)
e411325
@sbc100
3.1.41 (emscripten-core#1230)
775ba04
@dschuff
Update node, 15.14.0 -> 16.20.0 (emscripten-core#1232)
d7327b4 
This allows us to use the native ARM64 version on MacOS.
Also update the test scripts to work on ARM64 mac, and skip tests that aren't relevant.
@sbc100
3.1.42 (emscripten-core#1238)
c2260b4
@sbc100
Prefer arm64 over aarch64 internally. NFC (emscripten-core#1246)
1d59cd2 
This seems like more commonly known/used name for the architecture
these days.
@sbc100
Add some basic testing of arm64 linux (emscripten-core#1247)
88ee963
@sbc100
Add a warning when trying to install linux-arm64 binaries (emscripten…
098a3ff 
…-core#1249)

See dotnet#547
@sbc100
Fix activated_path_skip on repeated running of emsdk_env.sh (emsc…
c88612d 
…ripten-core#1250)

The first time around `node` was being correctly added to the PATH, but
the second time around this code was observing the emsdk copy of node
in the PATH and assuming it could be skipped.

Fixes: emscripten-core#1240
@kripken
Fix a typo (emscripten-core#1251)
3bde060
@kleisauke
Docker: use a entrypoint script (emscripten-core#1227)
e28e476 
In favor of `/etc/bash.bashrc`, which is only read for interactive
shells.
@sbc100
3.1.43 (emscripten-core#1254)
d9c66fa
@sbc100
Have create_release.py push the new branch automatically (emscripten-…
2d3b8a7 
…core#1255)

Having used this script for a while now I'm not sure there is any
point if leaving this last step as a manual push.
@sbc100
Update linux arm64 to 3.1.41 (emscripten-core#1256)
11fa694
@sbc100
Rename zipfile to archive or download as appropriate. NFC (emsc…
4f2db96 
…ripten-core#1257)
@sbc100
Update linux arm64 to 3.1.43 (emscripten-core#1258)
b6df670
@sbc100
3.1.44 (emscripten-core#1260)
a896e3d
@martijneken
wasm_cc_binary: Specify a default OS. Allow users to override platfor…
ef2a8e9 
…m. (emscripten-core#1262)

* wasm_cc_binary: Specify a default OS. Allow users to override platform.

Problem: proxy-wasm/proxy-wasm-cpp-sdk#157 (comment)

This is solving the problem in two different ways. Please let me know
your thoughts about both approaches, as either will work.

Signed-off-by: Martijn Stevenson <mstevenson@google.com>

* Rework platform selection to trigger os:wasi off standalone attr

Signed-off-by: Martijn Stevenson <mstevenson@google.com>

---------

Signed-off-by: Martijn Stevenson <mstevenson@google.com>
sbc100 and others added 16 commits January 3, 2024 10:25
@sbc100
Restore npm install step removed in emscripten-core#1325 (emscripten-…
0bbae74 
…core#1329)
@sbc100
3.1.52 (emscripten-core#1332)
96bd9f0
@sbc100
Only pass -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON when building llv…
f2baa2f 
…m. NFC (emscripten-core#1334)
@sbc100
[ci] Update to latest version of cicleci windows orb (emscripten-core…
4f0128e 
…#1339)

See emscripten-core/emscripten#21110
@sbc100
3.1.53 (emscripten-core#1336)
2aa7490
@sbc100
3.1.54 (emscripten-core#1343)
c18280c
@sbc100
3.1.55 (emscripten-core#1350)
7815dca
@sbc100
Remove JS_ENGINES and COMPILER_ENGINE from config file (emscripten-co…
5726ccc 
…re#1354)

`COMPILER_ENGINE` was completely removed from emscripten in
emscripten-core/emscripten#9469.

`JS_ENGINES` is only used/needed for testing and is no longer needed
as of emscripten-core/emscripten#9542.
@aheejin
3.1.56 (emscripten-core#1353)
da5a192
@sbc100
CI: Build latest docker image rather than tot (emscripten-core#1359)
44bf7cf 
This means that CI run that update `latest` actually test the thing
we are about to ship.

We recently had a case where `latest` was broken but `tot` was fixes
and we accidentally shipped a broken SDK version (emscripten-core#1353).
@sbc100
Prefer curl for downloading files over urllib (emscripten-core#1355)
ccd111f 
This is especially important on macOS where `urllib` can fail to
verify certificates.

See https://stackoverflow.com/questions/40684543/how-to-make-python-use-ca-certificates-from-mac-os-truststore

Fixes: emscripten-core#1207, dotnet#85, emscripten-core#1356, emscripten-core#1357, emscripten-core#1358
@aheejin
3.1.56 (emscripten-core#1360)
e10826f 
emscripten-core#1353 turned out to be broken, so this is the second try.
@radekdoulik
Merge tag '3.1.56'
8c6f771
@lewing
Bump the package versions too
91ec18f
@dotnet-maestro @lewing
Update dependencies from https://github.com/dotnet/emscripten build 2…
c3c488b 
…0240412.1

Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport
 From Version 9.0.0-alpha.1.24208.1 -> To Version 9.0.0-alpha.1.24212.1
@lewing
Merge branch 'main' into pr-merge-upstream-3.1.56
7e772a6
@lewing
Copy link
Member

lewing commented Apr 13, 2024 •
edited

@radekdoulik I've pulled in the new emscripten version too, we could produce an official build then manually update icu and runtime prs with that build

@lewing
Copy link
Member

lewing commented Apr 15, 2024

Looks like it really wants clang 19

@radekdoulik
Copy link
Member Author

Let see if dotnet/emscripten#67 builds. We can try to use the llvm 16

dotnet-maestro bot and others added 11 commits May 14, 2024 12:45
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/binaryen build 202…
2cdd92e 
…40412.1

runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport
 From Version 9.0.0-alpha.1.24208.2 -> To Version 9.0.0-alpha.1.24212.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/emscripten build 2…
2ca427c 
…0240412.1

Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport
 From Version 9.0.0-alpha.1.24208.1 -> To Version 9.0.0-alpha.1.24212.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/binaryen build 202…
7e5b7d6 
…40412.1

runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport
 From Version 9.0.0-alpha.1.24208.2 -> To Version 9.0.0-alpha.1.24212.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/emscripten build 2…
77c3082 
…0240412.1

Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport
 From Version 9.0.0-alpha.1.24208.1 -> To Version 9.0.0-alpha.1.24212.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/binaryen build 202…
0918bb4 
…40412.1

runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport
 From Version 9.0.0-alpha.1.24208.2 -> To Version 9.0.0-alpha.1.24212.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/emscripten build 2…
cfbc0f9 
…0240415.1

Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport
 From Version 9.0.0-alpha.1.24208.1 -> To Version 9.0.0-alpha.1.24215.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/llvm-project build…
f48b487 
… 20240415.4

runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport
 From Version 16.0.5-alpha.1.24204.1 -> To Version 16.0.5-alpha.1.24215.4
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/binaryen build 202…
a39ce93 
…40415.1

runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport
 From Version 9.0.0-alpha.1.24208.2 -> To Version 9.0.0-alpha.1.24215.1
@dotnet-maestro @radekdoulik
Update dependencies from https://github.com/dotnet/node build 20240415.1
5831a08 
runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
 From Version 9.0.0-alpha.1.24208.1 -> To Version 9.0.0-alpha.1.24215.1
@radekdoulik
Use latest emscripten transport package
559366c
@radekdoulik
Use LLVM 19.x
c3a7de6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone