diff options
| author | bors-servo <infra@servo.org> | 2023-06-05 10:54:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 10:54:44 +0200 |
| commit | 1bd1441d0bd3f861dac044a617d152add1667471 (patch) | |
| tree | 7c1fcea9cfbd5f6664ead6c16137c8eb2bbec9e3 | |
| parent | 6cf6b53b687005fa2c812b6cefaa462a5bc7f472 (diff) | |
| parent | 019b88770a242d6680f450c56d0f322afc132054 (diff) | |
| download | servo-1bd1441d0bd3f861dac044a617d152add1667471.tar.gz servo-1bd1441d0bd3f861dac044a617d152add1667471.zip | |
Auto merge of #29841 - mrobinson:update-mozjs, r=jdm
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.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #29142
- [x] These changes do not require tests
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
| -rw-r--r-- | .github/workflows/mac.yml | 9 | ||||
| -rw-r--r-- | 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", |