Skip to content

/ saltfs

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add jq as required util for upstream wpt sync #954

Merged
merged 1 commit into from Apr 5, 2019
Merged

Add jq as required util for upstream wpt sync #954

merged 1 commit into from Apr 5, 2019

Conversation

@CYBAI
Copy link
Contributor

CYBAI commented Apr 5, 2019 •
edited by larsbergstrom

servo/servo#23162 should be merged after this one

This change is Reviewable
@CYBAI
Add jq as required util
Loading status checks…
a178ab0
@CYBAI CYBAI mentioned this pull request Apr 5, 2019
Merged
4 of 4 tasks complete
@jdm
Copy link
Member

jdm commented Apr 5, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2019

📌 Commit a178ab0 has been approved by jdm
bors-servo added a commit that referenced this pull request Apr 5, 2019
@bors-servo
Auto merge of #954 - CYBAI:upstream-wpt-jq, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c700764 
Add jq as required util for upstream wpt sync

servo/servo#23162 should be merged after this one

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/954)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2019

⌛ Testing commit a178ab0 with merge c700764...
@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2019

☀️ Test successful - checks-travis
Approved by: jdm
Pushing c700764 to master...
@bors-servo bors-servo merged commit a178ab0 into servo:master Apr 5, 2019
2 checks passed
2 checks passed
Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@jdm
Copy link
Member

jdm commented Apr 5, 2019

Ah, shoot. I just remembered that this change will only affect servo-master1, which runs the webhook. We actually want to change

saltfs/servo-build-dependencies/init.sls

Lines 26 to 42 in c700764

{% if grains['os'] == 'MacOS' %}
- autoconf@2.13
- automake
- cmake
- ffmpeg
- freetype
- gstreamer
- gst-plugins-base
- gst-plugins-good
- gst-plugins-bad
- llvm
- makedepend
- openssl
- pkg-config
- wget
- yasm
- zlib
which controls the packages installed on our mac build machines that actually run the nightly script.
@CYBAI
Copy link
Contributor Author

CYBAI commented Apr 6, 2019

Oops, let me send another PR to remove this one and add jq to the above block!
@CYBAI CYBAI mentioned this pull request Apr 6, 2019
Merged
bors-servo added a commit that referenced this pull request Apr 6, 2019
@bors-servo
Auto merge of #955 - CYBAI:upstream-wpt-jq, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
095c151 
Add `jq` in server-build-dependencies for upstream WPT sync

We missed to add it in wrong place in  #954.
As @jdm mentioned, we should add `jq` in server build dependencies instead; or, the upstream wpt webhook one will only affect servo-mac1.
@jdm jdm removed the S-needs-deploy label May 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@CYBAI @jdm @bors-servo @highfive
You can’t perform that action at this time.