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

Update to UWP compatible OpenSSL build. #24257

Merged
merged 1 commit into from Oct 2, 2019
Merged

Update to UWP compatible OpenSSL build. #24257

merged 1 commit into from Oct 2, 2019

Conversation

@jdm
Copy link
Member

jdm commented Sep 20, 2019

This uses OpenSSL binaries built from https://github.com/servo/openssl-windows-build which yield no more WACK violations.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #24138
  • These changes do not require tests because no CI for WACK or windows yet.

This change is Reviewable

@highfive
Copy link

highfive commented Sep 20, 2019

Heads up! This PR modifies the following files:

@jdm
Copy link
Member Author

jdm commented Sep 21, 2019

@highfive highfive assigned paulrouget and unassigned avadacatavra Sep 21, 2019
@jdm
Copy link
Member Author

jdm commented Sep 23, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2019

📌 Commit 5de8578 has been approved by jdm

@highfive highfive assigned jdm and unassigned paulrouget Sep 23, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2019

Testing commit 5de8578 with merge 2c9a597...

bors-servo added a commit that referenced this pull request Sep 23, 2019
Update to UWP compatible OpenSSL build.

This uses OpenSSL binaries built from https://github.com/servo/openssl-windows-build which yield no more WACK violations.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24138
- [x] These changes do not require tests because no CI for WACK or windows yet.

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

bors-servo commented Sep 23, 2019

💔 Test failed - linux-rel-css

@jdm
Copy link
Member Author

jdm commented Sep 23, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2019

Testing commit 5de8578 with merge d49a9c4...

bors-servo added a commit that referenced this pull request Sep 23, 2019
Update to UWP compatible OpenSSL build.

This uses OpenSSL binaries built from https://github.com/servo/openssl-windows-build which yield no more WACK violations.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24138
- [x] These changes do not require tests because no CI for WACK or windows yet.

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

bors-servo commented Sep 23, 2019

💔 Test failed - linux-rel-css

@jdm
Copy link
Member Author

jdm commented Sep 23, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2019

Testing commit 5de8578 with merge b694c14...

bors-servo added a commit that referenced this pull request Sep 24, 2019
Update to UWP compatible OpenSSL build.

This uses OpenSSL binaries built from https://github.com/servo/openssl-windows-build which yield no more WACK violations.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24138
- [x] These changes do not require tests because no CI for WACK or windows yet.

<!-- 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/24257)
<!-- Reviewable:end -->
@jdm jdm force-pushed the jdm-patch-56 branch from 5de8578 to 7332adc Oct 2, 2019
@jdm
Copy link
Member Author

jdm commented Oct 2, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 2, 2019

📌 Commit 7332adc has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Oct 2, 2019

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

@jdm jdm force-pushed the jdm-patch-56 branch from 7332adc to 96302ba Oct 2, 2019
@jdm
Copy link
Member Author

jdm commented Oct 2, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 2, 2019

📌 Commit 96302ba has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Oct 2, 2019

Testing commit 96302ba with merge 66035b0...

bors-servo added a commit that referenced this pull request Oct 2, 2019
Update to UWP compatible OpenSSL build.

This uses OpenSSL binaries built from https://github.com/servo/openssl-windows-build which yield no more WACK violations.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24138
- [x] These changes do not require tests because no CI for WACK or windows yet.

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

bors-servo commented Oct 2, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing 66035b0 to master...

@bors-servo bors-servo merged commit 96302ba into master Oct 2, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
bors-servo added a commit that referenced this pull request Oct 3, 2019
Use correct OpenSSL arch in UWP builds.

This is a followup from #24257. I forgot to run the UWP WACK tests after making my changes, or I would have noticed that the wrong DLLs were being selected for UWP builds.

<!-- 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/24352)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 3, 2019
Use correct OpenSSL arch in UWP builds.

This is a followup from #24257. I forgot to run the UWP WACK tests after making my changes, or I would have noticed that the wrong DLLs were being selected for UWP builds.

<!-- 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/24352)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 3, 2019
Use correct OpenSSL arch in UWP builds.

This is a followup from #24257. I forgot to run the UWP WACK tests after making my changes, or I would have noticed that the wrong DLLs were being selected for UWP builds.

<!-- 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/24352)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 3, 2019
Use correct OpenSSL arch in UWP builds.

This is a followup from #24257. I forgot to run the UWP WACK tests after making my changes, or I would have noticed that the wrong DLLs were being selected for UWP builds.

<!-- 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/24352)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 3, 2019
Use correct OpenSSL arch in UWP builds.

This is a followup from #24257. I forgot to run the UWP WACK tests after making my changes, or I would have noticed that the wrong DLLs were being selected for UWP builds.

<!-- 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/24352)
<!-- Reviewable:end -->
@SimonSapin SimonSapin deleted the jdm-patch-56 branch Dec 12, 2019
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.

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