Commit Graph

27 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
Florian Bruhin 4793070db3 Merge branch 'qt6-v2' into master-qt6 2023-03-17 20:30:13 +01:00
Florian Bruhin 253789d8c0 Revert "bleeding tests: Downgrade broken mesa"
This reverts commit 3f5febf227.

ec144824e8
Fixes #7509
2022-12-15 14:44:35 +01:00
Florian Bruhin 78f7784331 docker: Init archlinux keyring 2022-12-15 08:20:07 +01:00
Florian Bruhin cdef889b4c docker: Make sure to upgrade archlinux-keyring first 2022-12-15 08:16:16 +01:00
Florian Bruhin b4d32e04f4 Merge branch 'master' into qt6-v2 2022-12-13 09:05:32 +01:00
Florian Bruhin 3f5febf227 bleeding tests: Downgrade broken mesa
See https://archlinux.org/packages/extra/x86_64/mesa/download/
2022-12-06 10:38:53 +01:00
toofar ca667d6429 Fixup dockerfile template for qt6 configurations
The merge resolution I did in 2d66466194 was a bit hasty. Hopefully
all supported configurations should work now.
2022-11-20 16:15:06 +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 a03109dad2 ci: Fix docker build and add sanity check 2022-11-16 09:42:19 +01: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 108062d84d docker: Also enable community-testing for archlinux-unstable 2021-03-22 11:56:57 +01:00
Florian Bruhin 76b03db20e Revert "ci: Add workaround for Archlinux/Docker issue"
This reverts commit 478e4de7bd.
Fixed according to https://github.com/actions/virtual-environments/issues/2658
2021-03-08 14:04:56 +01:00
Florian Bruhin 30d54c8da4 Revert "ci: Use different workaround for Archlinux docker"
This reverts commit 545e37b913.
Doesn't actually seem to work...
2021-02-18 10:15:43 +01:00
Florian Bruhin 545e37b913 ci: Use different workaround for Archlinux docker 2021-02-16 11:24:40 +01:00
Florian Bruhin 8ba1a28fa5 Revert "Revert "ci: Add workaround for Archlinux/Docker issue""
This reverts commit 8fccc17bd8.
Still broken unfortunately (probably on GitHub's side)...
2021-02-15 14:24:27 +01:00
Florian Bruhin 8fccc17bd8 Revert "ci: Add workaround for Archlinux/Docker issue"
This reverts commit 478e4de7bd.
Maybe not needed anymore after https://bugs.archlinux.org/task/69563#comment196734
2021-02-15 14:22:18 +01:00
Florian Bruhin 478e4de7bd ci: Add workaround for Archlinux/Docker issue
See https://github.com/actions/virtual-environments/issues/2658
Thanks to https://github.com/lxqt/lxqt-panel/pull/1562
2021-02-10 19:58:04 +01: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 282b2b99e8 docker: Base on official Archlinux image 2021-01-04 11:58:31 +01:00
Florian Bruhin df7e0553d8 ci: Use installed Python version in Dockerfile
Archlinux upgrading from Python 3.8 to 3.9 broke the build - let's just
use whatever is in $PATH instead.
2020-12-03 10:51:46 +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