mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #25853 - asajeffrey:surfmanup, r=jdm
Replace glutin by winit + surfman 0.2 <!-- Please describe your changes on the following line: --> This PR updates surfman to 0.2, and replaces glutin with winit+surfman. --- <!-- 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 do not require tests because this should all be invisible <!-- 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. -->
This commit is contained in:
commit
306e8ac5f9
94 changed files with 2265 additions and 1513 deletions
|
@ -491,9 +491,7 @@ def macos_release_build_with_debug_assertions(priority=None):
|
|||
"./etc/ci/lockfile_changed.sh",
|
||||
"tar -czf target.tar.gz" +
|
||||
" target/release/servo" +
|
||||
" target/release/build/osmesa-src-*/output" +
|
||||
" target/release/build/osmesa-src-*/out/src/gallium/targets/osmesa/.libs" +
|
||||
" target/release/build/osmesa-src-*/out/src/mapi/shared-glapi/.libs",
|
||||
" resources",
|
||||
]))
|
||||
.with_artifacts("repo/target.tar.gz")
|
||||
.find_or_create("build.macos_x64_release_w_assertions." + CONFIG.tree_hash())
|
||||
|
@ -521,8 +519,7 @@ def linux_release_build_with_debug_assertions(layout_2020):
|
|||
./etc/ci/lockfile_changed.sh
|
||||
tar -czf /target.tar.gz \
|
||||
target/release/servo \
|
||||
target/release/build/osmesa-src-*/output \
|
||||
target/release/build/osmesa-src-*/out/lib/gallium
|
||||
resources
|
||||
sccache --show-stats
|
||||
""" % build_args)
|
||||
.with_artifacts("/target.tar.gz")
|
||||
|
@ -572,12 +569,17 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
|
|||
start = 1 # Skip the "extra" WPT testing, a.k.a. chunk 0
|
||||
name_prefix = "Layout 2020 "
|
||||
job_id_prefix = "2020-"
|
||||
args = "--layout-2020"
|
||||
args = ["--layout-2020"]
|
||||
else:
|
||||
start = 0
|
||||
name_prefix = ""
|
||||
job_id_prefix = ""
|
||||
args = ""
|
||||
args = []
|
||||
|
||||
# Our Mac CI runs on machines with an Intel 4000 GPU, so need to work around
|
||||
# https://github.com/servo/webrender/wiki/Driver-issues#bug-1570736---texture-swizzling-affects-wrap-modes-on-some-intel-gpus
|
||||
if platform == "macOS x64":
|
||||
args += ["--pref gfx.texture-swizzling.enabled=false"]
|
||||
|
||||
if chunks == "all":
|
||||
chunks = range(start, total_chunks + 1)
|
||||
|
@ -603,7 +605,7 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
|
|||
TOTAL_CHUNKS=str(total_chunks),
|
||||
THIS_CHUNK=str(this_chunk),
|
||||
PROCESSES=str(processes),
|
||||
WPT_ARGS=args,
|
||||
WPT_ARGS=" ".join(args),
|
||||
GST_DEBUG="3",
|
||||
)
|
||||
)
|
||||
|
@ -612,7 +614,6 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
|
|||
# https://github.com/servo/servo/issues/22438
|
||||
if this_chunk == 0:
|
||||
task.with_script("""
|
||||
./mach test-wpt-failure
|
||||
time python2 ./mach test-wpt --release --binary-arg=--multiprocess \
|
||||
--processes $PROCESSES \
|
||||
--log-raw test-wpt-mp.log \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue