mirror of
https://github.com/servo/servo.git
synced 2025-06-29 11:33:39 +01:00
Auto merge of #20885 - avadacatavra:rustup-req, r=jdm
updated rustup requirement <!-- Please describe your changes on the following line: --> Rustup changed their argparsing, which resulted in `./mach test-unit --nocapture` not working. Servo now requires a higher rustup version to ensure that mach commands work --- <!-- 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 - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- 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. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20885) <!-- Reviewable:end -->
This commit is contained in:
commit
ee785f6f23
1 changed files with 2 additions and 2 deletions
|
@ -337,8 +337,8 @@ class CommandBase(object):
|
||||||
return 1
|
return 1
|
||||||
raise
|
raise
|
||||||
version = tuple(map(int, re.match("rustup (\d+)\.(\d+)\.(\d+)", version_line).groups()))
|
version = tuple(map(int, re.match("rustup (\d+)\.(\d+)\.(\d+)", version_line).groups()))
|
||||||
if version < (1, 8, 0):
|
if version < (1, 11, 0):
|
||||||
print "rustup is at version %s.%s.%s, Servo requires 1.8.0 or more recent." % version
|
print "rustup is at version %s.%s.%s, Servo requires 1.11.0 or more recent." % version
|
||||||
print "Try running 'rustup self update'."
|
print "Try running 'rustup self update'."
|
||||||
return 1
|
return 1
|
||||||
toolchain = self.toolchain()
|
toolchain = self.toolchain()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue