Skip to content

/ servo

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

Remove some no-longer-necessary dependencies #26167

Merged
merged 1 commit into from Apr 13, 2020
Merged

Remove some no-longer-necessary dependencies #26167

merged 1 commit into from Apr 13, 2020

Conversation

@dralley
Copy link
Contributor

dralley commented Apr 10, 2020 •
edited

Remove some bits left over from Skia and Ubuntu 14.04 support
@dralley
dralley reviewed Apr 10, 2020
View changes
etc/taskcluster/docker/build.dockerfile
@@ -34,10 +34,6 @@ RUN \
# blurz
libdbus-1-dev \
#
# Skia
libglu1-mesa-dev \
libbz2-dev \

This comment has been minimized.

Sign in to view
Copy link
@dralley

dralley Apr 10, 2020

Author Contributor

Are either of these still required for other reasons?

This comment has been minimized.

Sign in to view
Copy link
@SimonSapin

SimonSapin Apr 10, 2020

Member

Let’s find out!

This comment has been minimized.

Sign in to view
Copy link
@dralley

dralley Apr 11, 2020

Author Contributor

It doesn't appear that they are
@SimonSapin
Copy link
Member

SimonSapin commented Apr 10, 2020

@bors-servo try=linux
bors-servo added a commit that referenced this pull request Apr 10, 2020
@bors-servo
Auto merge of #26167 - dralley:skia-leftovers, r=<try>
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…
2994e39 
Remove some bits left over from Skia
@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

⌛ Trying commit 0d1ec4b with merge 2994e39...
@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

☀️ Test successful - status-taskcluster
State: approved= try=True
@SimonSapin
Copy link
Member

SimonSapin commented Apr 10, 2020

Looks good, thanks!

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

bors-servo commented Apr 10, 2020

📌 Commit 0d1ec4b has been approved by SimonSapin
@highfive highfive assigned SimonSapin and unassigned jdm Apr 10, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

⌛ Testing commit 0d1ec4b with merge 4c67197...
bors-servo added a commit that referenced this pull request Apr 10, 2020
@bors-servo
Auto merge of #26167 - dralley:skia-leftovers, r=SimonSapin
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…
4c67197 
Remove some bits left over from Skia
@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

💔 Test failed - status-taskcluster
@dralley
Copy link
Contributor Author

dralley commented Apr 11, 2020 •
edited

It occurs to me that those packages can (possibly) also be removed from the README instructions and from bootstrap if they're no longer necessary.
@dralley dralley force-pushed the dralley:skia-leftovers branch from 0d1ec4b to 854a23b Apr 11, 2020
@dralley
dralley reviewed Apr 11, 2020
View changes
python/servo/bootstrap.py
@@ -21,33 +21,6 @@
from servo.util import extract, download_file, host_triple


def install_trusty_deps(force):

This comment has been minimized.

Sign in to view
Copy link
@dralley

dralley Apr 11, 2020 •
edited

Author Contributor

The Ubuntu 14.04 section of the readme was removed recently because it has been EOL for non-paid users for a year now.

#26127
@dralley dralley changed the title Remove some bits left over from Skia Remove some no-longer-necessary dependencies Apr 11, 2020
@dralley dralley force-pushed the dralley:skia-leftovers branch 2 times, most recently from 14b5153 to c219e30 Apr 11, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2020

☔ The latest upstream changes (presumably #26174) made this pull request unmergeable. Please resolve the merge conflicts.
@dralley dralley force-pushed the dralley:skia-leftovers branch from c219e30 to 34a70d2 Apr 13, 2020
@dralley
Remove some old requirements
Loading status checks…
a3bb64c 
Remove some bits left over from Skia and Ubuntu 14.04 support
@dralley dralley force-pushed the dralley:skia-leftovers branch from 34a70d2 to a3bb64c Apr 13, 2020
@CYBAI CYBAI removed the S-needs-rebase label Apr 13, 2020
@SimonSapin
Copy link
Member

SimonSapin commented Apr 13, 2020

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

bors-servo commented Apr 13, 2020

📌 Commit a3bb64c has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2020

⌛ Testing commit a3bb64c with merge 397ab53...
bors-servo added a commit that referenced this pull request Apr 13, 2020
@bors-servo
Auto merge of #26167 - dralley:skia-leftovers, r=SimonSapin
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…
397ab53 
Remove some no-longer-necessary dependencies

Remove some bits left over from Skia and Ubuntu 14.04 support
@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2020

💔 Test failed - status-taskcluster
@dralley
Copy link
Contributor Author

dralley commented Apr 13, 2020

Failure doesn't look related at all

2 unexpected results that are NOT known-intermittents:
  ▶ TIMEOUT [expected PASS] /css/CSS2/floats-clear/clear-initial-001.xht
  │ 
  │ _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL.
  │ 
  │ 
  │ 
  │ Shutting down the Constellation after generating an output file or exit flag specified
  └ 19 threads are still running after shutdown (bad).
  ▶ TIMEOUT [expected FAIL] /css/CSS2/floats-clear/clear-on-parent-and-child.html
  │ 
  │ _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL.
  │ 
  │ 
  │ 
  │ Shutting down the Constellation after generating an output file or exit flag specified
  └ 19 threads are still running after shutdown (bad).
@jdm
Copy link
Member

jdm commented Apr 13, 2020

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2020

⌛ Testing commit a3bb64c with merge 7ae1158...
@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2020

☀️ Test successful - status-taskcluster
Approved by: SimonSapin
Pushing 7ae1158 to master...
@bors-servo bors-servo merged commit 7ae1158 into servo:master Apr 13, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Apr 13, 2020
Merged
4 of 5 tasks complete
@dralley dralley deleted the dralley:skia-leftovers branch Apr 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonSapin SimonSapin

Assignees

@SimonSapin SimonSapin

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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