mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #24491 - servo:rustup, r=nox
Upgrade sccache to 0.2.12 This picks up https://github.com/mozilla/sccache/issues/488, which fixes running Servo’s unit tests with Rust nightly-2019-10-17: https://github.com/rust-lang/rust/issues/65558 https://tools.taskcluster.net/groups/Mh6AMaNkTj-dw0hfmekTYw/tasks/AO0ydhMpTZyBa5HesI1ldw/runs/0/logs/public%2Flogs%2Flive.log#L1443
This commit is contained in:
commit
5fb941d6f7
2 changed files with 12 additions and 12 deletions
20
Cargo.lock
generated
20
Cargo.lock
generated
|
@ -155,8 +155,8 @@ source = "git+https://github.com/servo/autocfg?branch=rustflags2#9142612f4b2599e
|
|||
|
||||
[[package]]
|
||||
name = "azure"
|
||||
version = "0.36.1"
|
||||
source = "git+https://github.com/servo/rust-azure#5996612af3139cc3c5eafb019d8218f8ca1634de"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/servo/rust-azure#1dbd223157997b5b5301e7da73bff37f928a7418"
|
||||
dependencies = [
|
||||
"cmake",
|
||||
"euclid",
|
||||
|
@ -2300,13 +2300,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "io-surface"
|
||||
version = "0.11.1"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f9a33981dff54baaff80f4decb487a65d148a3c00facc97820d0f09128f74dd"
|
||||
checksum = "2279a6faecd06034f88218f77f7a767693e0957bce0323a96d92747e2760b445"
|
||||
dependencies = [
|
||||
"cgl 0.2.3",
|
||||
"cgl 0.3.0",
|
||||
"core-foundation",
|
||||
"gleam 0.6.18",
|
||||
"gleam 0.7.0",
|
||||
"leaky-cow",
|
||||
"libc",
|
||||
]
|
||||
|
@ -4620,15 +4620,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "servo-skia"
|
||||
version = "0.30000022.0"
|
||||
version = "0.30000023.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2df44d1fcd25d158fc5430a588daaa4aec88df6306ddf2a079f99dfd52672102"
|
||||
checksum = "3cf31d622cdfc24317eb1caa1018294f8058eb8315c9ed79103487b9504ddadb"
|
||||
dependencies = [
|
||||
"cgl 0.2.3",
|
||||
"cgl 0.3.0",
|
||||
"cmake",
|
||||
"euclid",
|
||||
"expat-sys",
|
||||
"gleam 0.6.18",
|
||||
"gleam 0.7.0",
|
||||
"glutin",
|
||||
"glx",
|
||||
"io-surface",
|
||||
|
|
|
@ -46,6 +46,6 @@ RUN \
|
|||
#
|
||||
#
|
||||
curl -sSfL \
|
||||
https://github.com/mozilla/sccache/releases/download/0.2.7/sccache-0.2.7-x86_64-unknown-linux-musl.tar.gz \
|
||||
https://github.com/mozilla/sccache/releases/download/0.2.12/sccache-0.2.12-x86_64-unknown-linux-musl.tar.gz \
|
||||
| tar -xz --strip-components=1 -C /usr/local/bin/ \
|
||||
sccache-0.2.7-x86_64-unknown-linux-musl/sccache
|
||||
sccache-0.2.12-x86_64-unknown-linux-musl/sccache
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue