SDK update #856

paulrouget · 2018-07-16T05:08:56Z

This works locally, but I haven't tested extensively. vagrand provision runs without any error.

This is necessary for: servo/servo#20912

Any recommendation for how to land this?

This change is

paulrouget · 2018-07-16T10:20:54Z

Any recommendation on how to land this?

Is it ok to land this PR then not land anything until servo/servo#20912 lands (ready to land, just need the saltfs update)

SimonSapin · 2018-07-16T14:03:03Z

Would PRs start failing if we deploy this without landing servo/servo#20912 ?

I think we have a mechanism to actually close the tree until a given PR lands, but if it’s ready it’s probably fine to just r+ it when appropriate, possibly with a priority. There isn’t a lot of PR traffic at the moment.

By the way, maybe servo/servo#21185 makes this unnecessary? But no need to block if this is ready, let’s do whichever you think is easiest.

paulrouget · 2018-07-17T05:46:08Z

Would PRs start failing

I haven't tested master with the new build tools and the new SDK. I'd be surprised if it works.

it’s probably fine to just r+ it when appropriate, possibly with a priority

Ok.

By the way, maybe servo/servo#21185 makes this unnecessary?

Using the new bootstrap mechanism is great, but not enough. We also need to update the JRE alternative.

paulrouget · 2018-07-17T05:56:22Z

@bors-servo r=SimonSapin p=1

bors-servo · 2018-07-17T05:56:23Z

📌 Commit 0ebff08 has been approved by SimonSapin

bors-servo · 2018-07-17T05:56:26Z

⌛ Testing commit 0ebff08 with merge 9d9d218...


        Auto merge of #856 - paulrouget:sdk_update, r=SimonSapin

SDK update This works locally, but I haven't tested extensively. `vagrand provision` runs without any error. This is necessary for: servo/servo#20912 Any recommendation for how to land this?  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/856)

bors-servo · 2018-07-17T06:09:57Z

💔 Test failed - status-travis

paulrouget · 2018-07-17T06:17:13Z

@bors-servo retry

bors-servo · 2018-07-17T06:17:16Z

⌛ Testing commit 0ebff08 with merge a7cf76b...


        Auto merge of #856 - paulrouget:sdk_update, r=SimonSapin

SDK update This works locally, but I haven't tested extensively. `vagrand provision` runs without any error. This is necessary for: servo/servo#20912 Any recommendation for how to land this?  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/856)

bors-servo · 2018-07-17T06:30:50Z

💔 Test failed - status-travis

paulrouget · 2018-07-17T06:32:15Z

==> Installing saltstack
==> Downloading https://homebrew.bintray.com/bottles/saltstack-2016.3.3.sierra.b
==> Pouring saltstack-2016.3.3.sierra.bottle.tar.gz
Error: undefined method `undent' for #<String:0x0000000103a09750>

SimonSapin · 2018-07-17T07:30:12Z

It looks like we’re installing an old version of the formula:

saltfs/.travis/install_salt.sh

Line 50 in 5f6a0f0

    
           brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9e3a66b6b7ca978bfea86897dcc3391c37f9f0ef/Formula/saltstack.rb

paulrouget · 2018-07-17T08:08:17Z

We're trying to install our own version of the formula. See #859

bors-servo · 2018-07-25T22:18:37Z

☔ The latest upstream changes (presumably #863) made this pull request unmergeable. Please resolve the merge conflicts.

jdm · 2018-07-26T21:23:13Z

@paulrouget Want to rebase this and remove everything except the java update?


        Use Java 8

paulrouget · 2018-07-27T04:14:04Z

@bors-servo r=SimonSapin p=1

jdm · 2018-07-27T11:41:45Z

@bors-servo r+

bors-servo · 2018-07-27T11:41:46Z

📌 Commit 39bd985 has been approved by jdm


        Auto merge of #856 - paulrouget:sdk_update, r=jdm

SDK update This works locally, but I haven't tested extensively. `vagrand provision` runs without any error. This is necessary for: servo/servo#20912 Any recommendation for how to land this?  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/856)

bors-servo · 2018-07-27T11:41:49Z

⌛ Testing commit 39bd985 with merge 4bdddb5...

bors-servo · 2018-07-27T11:52:43Z

💔 Test failed - status-travis

jdm · 2018-07-27T13:03:46Z

@bors-servo retry

bors-servo · 2018-07-27T13:03:49Z

⌛ Testing commit 39bd985 with merge ceb353f...


        Auto merge of #856 - paulrouget:sdk_update, r=jdm

SDK update This works locally, but I haven't tested extensively. `vagrand provision` runs without any error. This is necessary for: servo/servo#20912 Any recommendation for how to land this?  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/856)

bors-servo · 2018-07-27T13:19:38Z

☀️ Test successful - status-travis
Approved by: jdm
Pushing ceb353f to master...

highfive added the S-awaiting-review label Jul 16, 2018

paulrouget force-pushed the paulrouget:sdk_update branch 2 times, most recently from 3f2c95d to 0ebff08 Jul 16, 2018

paulrouget mentioned this pull request Jul 16, 2018

Revisit how the Android port works. servo/servo#20912

Merged

0 of 5 tasks complete

highfive assigned SimonSapin Jul 16, 2018

SimonSapin mentioned this pull request Jul 16, 2018

Stop using Salt-installed Android SDK on CI servo/servo#21185

Merged

highfive added S-awaiting-merge and removed S-awaiting-review labels Jul 17, 2018

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 17, 2018

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 17, 2018

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 17, 2018

highfive added the S-needs-rebase label Jul 25, 2018

Use Java 8

Loading status checks…

39bd985

paulrouget force-pushed the paulrouget:sdk_update branch from 0ebff08 to 39bd985 Jul 27, 2018

highfive added S-awaiting-review and removed S-tests-failed labels Jul 27, 2018

highfive assigned jdm and unassigned SimonSapin Jul 27, 2018

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Jul 27, 2018

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 27, 2018

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 27, 2018

bors-servo merged commit 39bd985 into servo:master Jul 27, 2018
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive added S-needs-deploy and removed S-awaiting-merge labels Jul 27, 2018

jdm removed the S-needs-deploy label Nov 8, 2018

servo / saltfs

SDK update #856

SDK update #856

paulrouget commented Jul 16, 2018 •

edited by larsbergstrom

paulrouget commented Jul 16, 2018

SimonSapin commented Jul 16, 2018

paulrouget commented Jul 17, 2018

paulrouget commented Jul 17, 2018

bors-servo commented Jul 17, 2018

bors-servo commented Jul 17, 2018

bors-servo commented Jul 17, 2018

paulrouget commented Jul 17, 2018

bors-servo commented Jul 17, 2018

bors-servo commented Jul 17, 2018

paulrouget commented Jul 17, 2018

SimonSapin commented Jul 17, 2018

paulrouget commented Jul 17, 2018

bors-servo commented Jul 25, 2018

jdm commented Jul 26, 2018

paulrouget commented Jul 27, 2018

jdm commented Jul 27, 2018

bors-servo commented Jul 27, 2018

bors-servo commented Jul 27, 2018

bors-servo commented Jul 27, 2018

jdm commented Jul 27, 2018

bors-servo commented Jul 27, 2018

bors-servo commented Jul 27, 2018

servo / saltfs

Join GitHub today

SDK update #856

SDK update #856

Conversation

paulrouget commented Jul 16, 2018 • edited by larsbergstrom

paulrouget commented Jul 16, 2018

SimonSapin commented Jul 16, 2018

paulrouget commented Jul 17, 2018

paulrouget commented Jul 17, 2018

bors-servo commented Jul 17, 2018

bors-servo commented Jul 17, 2018

bors-servo commented Jul 17, 2018

paulrouget commented Jul 17, 2018

bors-servo commented Jul 17, 2018

bors-servo commented Jul 17, 2018

paulrouget commented Jul 17, 2018

SimonSapin commented Jul 17, 2018

paulrouget commented Jul 17, 2018

bors-servo commented Jul 25, 2018

jdm commented Jul 26, 2018

paulrouget commented Jul 27, 2018

jdm commented Jul 27, 2018

bors-servo commented Jul 27, 2018

bors-servo commented Jul 27, 2018

bors-servo commented Jul 27, 2018

jdm commented Jul 27, 2018

bors-servo commented Jul 27, 2018

bors-servo commented Jul 27, 2018

paulrouget commented Jul 16, 2018 •

edited by larsbergstrom