Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,14 @@ jobs:
name: libmozjs-x86_64-unknown-linux-gnu.tar.gz

windows:
runs-on: windows-latest
runs-on: ${{ matrix.platform.os }}
strategy:
fail-fast: false
matrix:
features: ["debugmozjs", '""']
target: ["x86_64-pc-windows-msvc", "aarch64-pc-windows-msvc"]
platform:
- { target: x86_64-pc-windows-msvc, os: windows-latest }
- { target: aarch64-pc-windows-msvc, os: windows-11-arm }
env:
LINKER: "lld-link.exe"
CC: "clang-cl"
Expand All @@ -138,33 +140,23 @@ jobs:
run: |
curl -SL "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-4.0.zip" --create-dirs -o target/dependencies/moztools.zip
cd target/dependencies && unzip -qo moztools.zip -d .
- name: Install LLVM 19
run: |
# MSVC has headers that require clang-19.
# remove when windows runner updates to llvm 19
iwr -useb get.scoop.sh -outfile 'install.ps1'
.\install.ps1 -RunAsAdmin
scoop install llvm@19.1.7 --global
# Prepend to path so we override the default LLVM installation in priority
echo "C:\ProgramData\scoop\apps\llvm\current\bin;" + (Get-Content $env:GITHUB_PATH -Raw) | Set-Content $env:GITHUB_PATH
- name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.9
- name: Build Windows
shell: cmd
run: |
cargo +${{ steps.toolchain.outputs.name }} build --verbose --target ${{ matrix.target }} --features ${{ matrix.features }}
cargo +${{ steps.toolchain.outputs.name }} build --verbose --target ${{ matrix.platform.target }} --features ${{ matrix.features }}
- name: Test Windows
if: ${{ !contains(matrix.target, 'aarch64') }}
shell: cmd
run: |
cargo +${{ steps.toolchain.outputs.name }} test --tests --examples --verbose --target ${{ matrix.target }} --features ${{ matrix.features }}
cargo +${{ steps.toolchain.outputs.name }} test --tests --examples --verbose --target ${{ matrix.platform.target }} --features ${{ matrix.features }}

- name: Upload artifact
if: ${{ !contains(matrix.target, 'aarch64') && matrix.features != 'debugmozjs' && env.NEW_RUST_CHECK == 'false' }}
if: ${{ matrix.features != 'debugmozjs' && env.NEW_RUST_CHECK == 'false' }}
uses: actions/upload-artifact@v4
with:
path: ./target/${{ matrix.target }}/libmozjs-x86_64-pc-windows-msvc.tar.gz
name: libmozjs-x86_64-pc-windows-msvc.tar.gz
path: ./target/${{ matrix.platform.target }}/libmozjs-${{ matrix.platform.target }}.tar.gz
name: libmozjs-${{ matrix.platform.target }}.tar.gz

android:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- { target: x86_64-apple-darwin, os: macos-15-intel }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
- { target: x86_64-pc-windows-msvc, os: windows-latest }
- { target: aarch64-pc-windows-msvc, os: windows-11-arm }
runs-on: ${{ matrix.platform.os }}
env:
RELEASE_TAG: ${{ github.event_name == 'release' && github.ref_name || inputs.release-tag }}
Expand All @@ -38,7 +39,7 @@ jobs:
id: toolchain
with:
toolchain: ${{ env.RUST_TOOLCHAIN_INPUT }}
targets: ${{ matrix.target }}
targets: ${{ matrix.platform.target }}
- name: Download prebuilt mozjs from artifact
if: ${{ env.RELEASE_TAG == '' }}
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion mozjs-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "mozjs_sys"
description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
repository.workspace = true
version = "0.140.5-7"
version = "0.140.5-8"
authors = ["Mozilla", "The Servo Project Developers"]
links = "mozjs"
license.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions mozjs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "mozjs"
description = "Rust bindings to the Mozilla SpiderMonkey JavaScript engine."
repository.workspace = true
version = "0.14.5"
version = "0.14.6"
authors = ["The Servo Project Developers"]
license.workspace = true
edition.workspace = true
Expand All @@ -26,7 +26,7 @@ crown = ["mozjs_sys/crown"]
encoding_rs = "0.8.35"
libc.workspace = true
log = "0.4"
mozjs_sys = { version = "=0.140.5-7", path = "../mozjs-sys" }
mozjs_sys = { version = "=0.140.5-8", path = "../mozjs-sys" }
num-traits = "0.2"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
Expand Down
Loading