Skip to content
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

Make android sdk 25.2.3 default #644

Merged
merged 1 commit into from Apr 29, 2017

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Apr 21, 2017

Follow up to servo/servo#15773.


This change is Reviewable

Remove the old r24.4.1 version.
@aneeshusa aneeshusa force-pushed the aneeshusa:make-android-sdk-25.2.3-default branch from 9abf33f to a9e75da Apr 21, 2017
@aneeshusa aneeshusa mentioned this pull request Apr 21, 2017
1 of 5 tasks complete
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 29, 2017

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 29, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Apr 29, 2017

📌 Commit a9e75da has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Apr 29, 2017

Testing commit a9e75da with merge f950abf...

bors-servo added a commit that referenced this pull request Apr 29, 2017
…sbergstrom

Make android sdk 25.2.3 default

Follow up to servo/servo#15773.

<!-- 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/644)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 29, 2017

☀️ Test successful - status-travis
Approved by: larsbergstrom
Pushing f950abf to master...

@bors-servo bors-servo merged commit a9e75da into servo:master Apr 29, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 28, 2017

This has been deployed to servo-linux-cross{1,2,3}

bors-servo added a commit to servo/servo that referenced this pull request May 31, 2017
…ergstrom

Remove redundant ANDROID_SDK variables

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to #15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16566)
<!-- Reviewable:end -->
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request May 31, 2017
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0b6b6b2cb7e84cd3e6f492df9489a98464fa9d79
mcmanus pushed a commit to mcmanus/gecko that referenced this pull request May 31, 2017
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628
@aneeshusa
Copy link
Member Author

aneeshusa commented May 31, 2017

@larsbergstrom I checked via Salt and the symlink is still pointing to r24.4.1 on cross1 and cross2; did you leave a log of the highstate for this?

Due to #684, it may be best to hold off on trying to redeploy this for the moment.

JerryShih pushed a commit to JerryShih/gecko-dev that referenced this pull request Jun 2, 2017
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628
aethanyc pushed a commit to aethanyc/gecko-dev that referenced this pull request Jun 5, 2017
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 10, 2017

Linux 1:

lrwxrwxrwx 1 servo servo   31 Jun  7 18:41 current -> /home/servo/android/sdk/r25.2.3
drwxr-xr-x 7 servo servo 4096 May 31 04:08 r24.4.1
drwxr-xr-x 7 servo servo 4096 Apr 21 22:11 r25.2.3
root@ip-172-31-34-111:~# 

Linux2:

lrwxrwxrwx 1 servo servo   31 Jun  7 18:38 current -> /home/servo/android/sdk/r25.2.3
drwxr-xr-x 7 servo servo 4096 May 31 09:27 r24.4.1
drwxr-xr-x 7 servo servo 4096 Apr 21 20:57 r25.2.3
root@ip-172-31-43-142:~# 

so it should be fine?

Manishearth pushed a commit to Manishearth/gecko-dev that referenced this pull request Jun 11, 2017
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628
brendandahl pushed a commit to brendandahl/gecko that referenced this pull request Jul 10, 2017
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628

UltraBlame original commit: ae809917d5db3293869402f858ce1cf5e4a72968
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628

UltraBlame original commit: ae809917d5db3293869402f858ce1cf5e4a72968
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019
…eeshusa:remove-android-sdk-override); r=larsbergstrom

The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628

UltraBlame original commit: ae809917d5db3293869402f858ce1cf5e4a72968
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.