From 019b88770a242d6680f450c56d0f322afc132054 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Sun, 4 Jun 2023 19:40:05 +0200 Subject: [PATCH] Update mozjs to get new mach version The mozjs repository now has a version of mach that works more consistently with newer versions of Python. Fixes #29142. --- .github/workflows/mac.yml | 9 --------- Cargo.lock | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index fd09f5ddb2c..2724f5044de 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -54,15 +54,6 @@ jobs: fetch-depth: 2 - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.3 - # TODO: Remove this step when the compatibility issue between mozjs and - # Homebrew's Python 3.10 formula (servo/rust-mozjs#559) is fixed - - name: Select Python 3.9 - run: | - brew install python@3.9 - cd $(dirname $(which python3.9)) - rm -f python3 pip3 - ln -s python3.9 python3 - ln -s pip3.9 pip3 - name: Bootstrap run: | python3 -m pip install --upgrade pip virtualenv diff --git a/Cargo.lock b/Cargo.lock index 99a54bbc055..d8ce282dcf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3752,7 +3752,7 @@ dependencies = [ [[package]] name = "mozjs" version = "0.14.1" -source = "git+https://github.com/servo/mozjs#b9edc816b6662a5986e190cdf53ae295049acb92" +source = "git+https://github.com/servo/mozjs#98b678283d1b0c6d263302ca2aff770aece0cb8e" dependencies = [ "cc", "lazy_static", @@ -3765,7 +3765,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.68.2" -source = "git+https://github.com/servo/mozjs#b9edc816b6662a5986e190cdf53ae295049acb92" +source = "git+https://github.com/servo/mozjs#98b678283d1b0c6d263302ca2aff770aece0cb8e" dependencies = [ "bindgen", "cc",