Auto merge of #8601 - mfeckie:feature/manifest-diff-ci-check, r=jdm

Check if MANIFEST.json changes as per #8587

Adds a script which checks if either of the MANIFEST.json files change in `test/wpt` in response to #8587

- Addresses currently incorrect MANIFEST.json
- Adds checking script

PR for saltfs to add to CI checks to follow (https://github.com/servo/saltfs/pull/163)

https://reviewable.io/reviews/servo/servo/8601

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8601)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-21 20:13:10 +05:30
commit f2fe1171d2
4 changed files with 9 additions and 2 deletions

View file

@ -11,6 +11,7 @@ matrix:
script:
- ./mach build -d --verbose
- bash etc/ci/lockfile_changed.sh
- bash etc/ci/manifest_changed.sh
cache:
directories:
- .cargo

6
etc/ci/manifest_changed.sh Executable file
View file

@ -0,0 +1,6 @@
#!/bin/bash
./mach test-wpt --manifest-update SKIP_TESTS > /dev/null
./mach test-css --manifest-update SKIP_TESTS > /dev/null
diff=$(git diff -- tests/*/MANIFEST.json)
echo "$diff"
[[ ! $diff ]]

View file

@ -35511,4 +35511,4 @@
"rev": "5a754b40cd49c0404863c431b58cc311dc5d167c",
"url_base": "/",
"version": 2
}
}

View file

@ -9881,7 +9881,7 @@
"path": "css/viewport_ignore_desktop.html",
"references": [
[
"/_mozilla/css/viewport_ignore_desktop.html",
"/_mozilla/css/viewport_ignore_desktop_ref.html",
"=="
]
],