Skip to content

[qscintilla] Update to 2.11.4#10511

Merged
ras0219-msft merged 16 commits intomicrosoft:masterfrom
longhuan2018:update-port-qscintilla
Apr 17, 2020
Merged

[qscintilla] Update to 2.11.4#10511
ras0219-msft merged 16 commits intomicrosoft:masterfrom
longhuan2018:update-port-qscintilla

Conversation

@longhuan2018
Copy link
Contributor

update qscintilla version from 2.10 to 2.11.4
change Homepage from "https://sourceforge.net/projects/pyqt" to "https://www.riverbankcomputing.com/software/qscintilla"

@longhuan2018
Copy link
Contributor Author

longhuan2018 commented Mar 23, 2020

I don't know why it went wrong, I checked the log of CI and found that compiling qscintilla was successful.
I think this is a CI problem, I don't know how to solve it.

@NancyLi1013
Copy link
Contributor

Hi @longhuan2018
Thanks for this PR.
There is something wrong with CI test and we have been trying to fix the regressions in this PR #10508.
Once fixed, we will re run this PR.

@longhuan2018
Copy link
Contributor Author

Hi @longhuan2018
Thanks for this PR.
There is something wrong with CI test and we have been trying to fix the regressions in this PR #10508.
Once fixed, we will re run this PR.

OK, I just modified it according to your prompt, but CI still fails. I'm sure QScintilla supports linux and osx, so I will revert these changes and wait for the CI problem to be solved.

@NancyLi1013
Copy link
Contributor

Thanks for your update.

I noticed it was set as fail on linux and osx in ci.baseline.txt.
If you can confirm this port supports linux and osx, there is no need to add the prompt I suggested.
And we should remove the following codes from c.baseline.txt.

qscintilla:x64-linux=fail
qscintilla:x64-osx=fail

But I saw the CI test results, only linux is passing. So please help confirm if it supports on osx.
Of course,you don't need to update this now until the CI problem is fixed.

@NancyLi1013
Copy link
Contributor

You don't need to care about other regressions that are not related with this PR.
Let's just wait for the CI problem is fixed.
Once fixed, I will re run this PR.

@NancyLi1013
Copy link
Contributor

/azp run

@NancyLi1013
Copy link
Contributor

It seems that it has passed on Linux platform.
##[error] PASSING, REMOVE FROM FAIL LIST: qscintilla:x64-linux (/ci/myagent/_work/3/s/scripts/ci.baseline.txt)
Please update ci.baseline.txt.

Also, please add vcpkg_fail_port_install(ON_TARGET "osx") to top of portfile.cmake
add Supports: !osx to CONTROL file.

@longhuan2018
Copy link
Contributor Author

It seems that it has passed on Linux platform.
##[error] PASSING, REMOVE FROM FAIL LIST: qscintilla:x64-linux (/ci/myagent/_work/3/s/scripts/ci.baseline.txt)
Please update ci.baseline.txt.

Also, please add vcpkg_fail_port_install(ON_TARGET "osx") to top of portfile.cmake
add Supports: !osx to CONTROL file.

OK, I will modify it according to your opinion. In addition, I think qscintilla supports osx. How can I make CI compile it?

@NancyLi1013
Copy link
Contributor

If it supports osx, you can remove qscintilla:x64-osx from ci.baseline.txt.
Then try to fix the regressions.
It might be better to make sure that this port can work well on you local Mac machine first.

@longhuan2018
Copy link
Contributor Author

If it supports osx, you can remove qscintilla:x64-osx from ci.baseline.txt.
Then try to fix the regressions.
It might be better to make sure that this port can work well on you local Mac machine first.

I compiled qscintilla under osx successfully. But CI failed to compile under osx, but I found that it has not been compiled to qscintilla port. The failure was caused by the glib port. Is there a problem with CI's osx environment?

@NancyLi1013
Copy link
Contributor

Hi @longhuan2018
Could you please resolve the conflicts first?

@longhuan2018
Copy link
Contributor Author

Hi @longhuan2018
Could you please resolve the conflicts first?

I have resolved the conflict, and now it can be compiled under osx and linux.

@NancyLi1013
Copy link
Contributor

LGTM. Thanks for your update.

@NancyLi1013 NancyLi1013 added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed waiting for response labels Apr 16, 2020
@ras0219-msft ras0219-msft merged commit 71377f6 into microsoft:master Apr 17, 2020
@ras0219-msft
Copy link
Contributor

Thanks for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants