Commit Graph

10 Commits

Author SHA1 Message Date
toofar f68798a081 ci: attempt to make the qt6 docker run work
On CI were were getting "Could not import sip" because link_pyqt was
looking for PyQt5.sip.
I made that look at QUTE_QT_WRAPPER since that's being set already on
tox.ini
There are probably a few other changes around link_pyqt and the makefile
etc we need to change when we switch the default wrapper.

I overrode the default `py` tox environment with py-qt6 to override
those wrapper related variables. I probably could have done something
sneaky with curly braces to make it so we don't have to add a few more
lines to the file. But in my opinion in config file is far to obfuscated
and hard to maintain already.

I changed the docker file to call the new py-qt6 env if it's a qt6
container. I'm not 100% sure that is required though since there is also
a tox invocation in the GH action definition, maybe that overrides the
container entrypoint? Also changed the indentation in the dockerfile
template a bit to make it easier to see where the conditionals start and
end.

Speaking of which I changed the matrix definition and tox invocation to
match a later one to hopefully make it so we can invoke different tox
environments in the containers without having to rebuild the containers.
Not sure I did that right, I'll see soon.

I added the unstable-qt6 container generation line so we can use it in
the future, and to match the not-qt6 one. I'm not switching to that in
CI though because the pyqt used by that is broken at the moment
(ref https://www.riverbankcomputing.com/pipermail/pyqt/2023-March/045214.html)

Also fixed the vim modeline in generate.py so my syntax highlighting
works.
2023-03-18 17:29:25 +13:00
toofar 2d66466194 Merge branch 'master' into qt6-v2
Just a few conflicts around CI and dependencies.
2022-11-20 15:48:00 +13:00
Florian Bruhin f0489cb6a5 ci: Keep QtWebKit on live support a bit longer
See #7478, #4039
2022-11-16 09:28:38 +01:00
Florian Bruhin 0cd682afbd Revert "ci: Drop QtWebKit"
This reverts commit 00ee3fad34.
2022-11-16 09:10:42 +01:00
Florian Bruhin 00ee3fad34 ci: Drop QtWebKit
See #7478, #4039
2022-11-14 21:24:03 +01:00
Florian Bruhin 0cf7453fc3 ci: Prepare Qt 6 dockerfiles 2022-08-23 18:31:41 +02:00
Florian Bruhin 1a4fff1a42 doc: Switch URLs to https 2021-01-26 15:19:01 +01:00
Florian Bruhin 222f1f19a1 Bump copyright years
Closes #6015
2021-01-20 20:06:19 +01:00
Florian Bruhin 31cd414664 ci: Fix lint for docker workflow 2020-11-25 22:34:18 +01:00
Florian Bruhin ec93c0458c Integrate docker rebuild workflow 2020-11-25 19:49:25 +01:00