Upgrade android docker images to use QT 6.11.0#20268
Upgrade android docker images to use QT 6.11.0#20268siddarthkay wants to merge 9 commits intomasterfrom
Conversation
Jenkins BuildsClick to see older builds (105)
|
QML tests are covered in #20262 For the build failure, it's the I'll look into this but frankly, I don't think we really need it at all |
|
@siddarthkay I updated the PR of mine at #20262 to also fix the build failure under Qt 6.11 (updated the |
|
nice, please get #20262 reviewed and merged, it seems your changes are backwards compatible |
|
I've merged the fix for Android. Android and IOS runs fine now with 6.11 |
ffab7e3 to
364e2c9
Compare
|
@siddarthkay the |
Merged to master |
This PR is not ready for reviews yet, thanks for pointing it out. |
00b50fd to
cfcdc85
Compare
ab59791 to
e837d16
Compare
cfdd4e8 to
4bee8ba
Compare
|
|
||
| # Use the same pre-built Docker image as CI (see ci/Jenkinsfile.android) | ||
| DOCKER_IMAGE := harbor.status.im/status-im/status-desktop-build:1.1.0-qt$(QT_VERSION)-android | ||
| DOCKER_IMAGE := harbor.status.im/status-im/status-desktop-build:1.0.0-qt$(QT_VERSION)-android |
There was a problem hiding this comment.
Why are we going backwards in versions?
| string( | ||
| name: 'DOCKER_TAG_ANDROID', | ||
| defaultValue: '1.1.0-qt6.9.2-android', | ||
| defaultValue: '1.0.0-qt6.11.0-android', |
There was a problem hiding this comment.
Again, going backwards in versions.
Summary :
6.11.0openmethod6.11.0