Skip to content

Commit 128e1e2

Browse files
authored
Update Spidermonkey to 128.13 and fix CI (#590)
* Update SpiderMonkey Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Apply patches Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Update SM commit and version Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Force LLVM-19 on windows Also fix the path that llvm is installed to by scoop. Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> --------- Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
1 parent 99731e7 commit 128e1e2

File tree

15 files changed

+174
-47
lines changed

15 files changed

+174
-47
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,15 @@ jobs:
121121
run: |
122122
curl -SL "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-4.0.zip" --create-dirs -o target/dependencies/moztools.zip
123123
cd target/dependencies && unzip -qo moztools.zip -d .
124-
- name: Install LLVM 19 on aarch64
125-
if: contains(matrix.target, 'aarch64')
124+
- name: Install LLVM 19
126125
run: |
127-
# install due to build errors caused by a bug in llvm 18
128-
# https://github.com/llvm/llvm-project/pull/93235
126+
# MSVC has headers that require clang-19.
129127
# remove when windows runner updates to llvm 19
130128
iwr -useb get.scoop.sh -outfile 'install.ps1'
131129
.\install.ps1 -RunAsAdmin
132130
scoop install llvm@19.1.7 --global
133-
echo "C:\ProgramData\scoop\scoop\apps\llvm\current\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
131+
# Prepend to path so we override the default LLVM installation in priority
132+
echo "C:\ProgramData\scoop\apps\llvm\current\bin;" + (Get-Content $env:GITHUB_PATH -Raw) | Set-Content $env:GITHUB_PATH
134133
- name: Run sccache-cache
135134
uses: mozilla-actions/sccache-action@v0.0.8
136135
- name: Build Windows

mozjs-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mozjs_sys"
33
description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
44
repository.workspace = true
5-
version = "0.128.9-3"
5+
version = "0.128.13-0"
66
authors = ["Mozilla"]
77
links = "mozjs"
88
license.workspace = true

mozjs-sys/etc/COMMIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f4b6f95e39503cb356c42e71fffa0a21e949fbd8
1+
7bd1c6b763a2944873579523666acc0d2e23acd5

mozjs-sys/mozjs/config/milestone.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/js/src/builtin/Date.js

Lines changed: 38 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/js/src/builtin/Promise.cpp

Lines changed: 33 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/js/src/debugger/Object.cpp

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/js/src/debugger/Object.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/js/src/doc/Debugger/Debugger.Object.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/js/src/jit/IonAnalysis.cpp

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)