Commit Graph

249 Commits

Author SHA1 Message Date
Florian Bruhin ec34865168 Move master branch references to main
Closes #7097
2023-07-23 11:38:19 +02:00
Florian Bruhin 8f34a2c9c6 ci: Fix issues 2023-06-30 19:29:28 +02:00
Florian Bruhin b5d5c7f4d3 More qt 6 tooling 2023-06-30 19:29:28 +02:00
Florian Bruhin ffc06e58d6 qt6: Switch most tooling/linting to Qt 6
Only mypy missing now...
2023-06-30 19:29:28 +02:00
Florian Bruhin 50a1f004f0 qt6 mypy: Enable on CI 2023-06-29 23:16:35 +02:00
Florian Bruhin 93c7fdd60c Initial Python 3.7 drop 2023-06-26 14:39:54 +02:00
Florian Bruhin 408e16917e ci: Kill remaining qt6-v2 references 2023-06-24 01:05:25 +02:00
Florian Bruhin 70e8dc63e8 Revert "Revert "ci: Remove Python 3.12 for now""
This reverts commit ded43c57c8.

Still segfaults on exit...
2023-06-09 20:25:49 +02:00
Florian Bruhin ded43c57c8 Revert "ci: Remove Python 3.12 for now"
This reverts commit a5d6e41005.

See #7727
2023-06-09 20:06:56 +02:00
Florian Bruhin a5d6e41005 ci: Remove Python 3.12 for now
See #7727
2023-05-31 13:00:24 +02:00
Florian Bruhin 06c5de554b ci: Decrease time limit again
Was due to https://github.com/pytest-dev/pytest/issues/10896
2023-04-14 21:04:12 +02:00
Florian Bruhin 6e018fe2ab ci: Test a bigger sample of Python versions
- Make sure we still test Python 3.7 and 3.8 after dropping old PyQt
  versions in c5a51eb0bc
- Keep a modern Python version (3.11) with Qt 5 around, however
- Make sure we still test Python 3.10 too
- Also start testing the Python 3.12 alpha
2023-04-11 15:21:40 +02:00
Florian Bruhin 6f5de192e0 ci: Install libxcb-cursor
See https://codereview.qt-project.org/c/qt/qtbase/+/325414
2023-04-11 14:53:17 +02:00
Florian Bruhin 986348acb9 Revert "ci: Disable broken Qt 6.5"
This reverts commit 681f7ffc57.
2023-04-11 14:53:02 +02:00
Florian Bruhin 681f7ffc57 ci: Disable broken Qt 6.5
See #7624
2023-04-11 13:55:06 +02:00
Florian Bruhin 950d55002e ci: Raise time limit even more
Apparently Windows CI is real slow on GitHub currently...
2023-04-10 23:28:22 +02:00
Florian Bruhin 30e70803d0 ci: Add PyQt 6.5
See #7624
2023-04-10 23:25:15 +02:00
Florian Bruhin 39b6a1e946 ci: Properly raise time limits
CodeQL only needs about 7 minutes, but Windows needs >45
2023-04-10 22:20:19 +02:00
Florian Bruhin 764dbfd008
Merge pull request #7660 from qutebrowser/dependabot/github_actions/peter-evans/create-pull-request-5
build(deps): bump peter-evans/create-pull-request from 4 to 5
2023-04-10 21:09:18 +02:00
Florian Bruhin 055224cb8d ci: Bump tests timeout once again
Looks like 45mins is too tight for GHA on Windows with heavy load...
2023-04-10 21:05:53 +02:00
dependabot[bot] 106a71f314
build(deps): bump peter-evans/create-pull-request from 4 to 5
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-10 19:01:49 +00:00
toofar 2d6d602f29 ci: update cov test run but keep it disabled
Error: qutebrowser/browser/webengine/certificateerror.py has 90.91% line and 50.00% branch coverage!
    Error: qutebrowser/browser/webengine/darkmode.py has 96.88% line and 100.00% branch coverage!
    Error: qutebrowser/keyinput/basekeyparser.py has 97.59% line and 100.00% branch coverage!
    Error: qutebrowser/keyinput/keyutils.py has 92.64% line and 96.30% branch coverage!
    Error: qutebrowser/utils/debug.py has 94.51% line and 92.19% branch coverage!
    Error: qutebrowser/utils/qtutils.py has 98.67% line and 96.74% branch coverage!
    Error: qutebrowser/utils/usertypes.py has 99.20% line and 96.30% branch coverage!
    Error: qutebrowser/utils/version.py has 97.66% line and 97.83% branch coverage!

Maybe we should open an issue to get them back up.
2023-03-18 17:30:26 +13:00
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 2b67070d16 ci: enable pyqt6.4 and py3.11 test matrix entries
6.4 tests should be passing now. 6.5 is still waiting on PyQt on PyPI
getting fixed. That goes for kde-unstable-qt6 too as that's pulling down
6.5.

We should take the opportunity to revisit the test matrix configuration
again when we add 6.5 in there. For example py3.11 on ubuntu 20.04 is a
bit odd as it only got released last year.
2023-03-18 16:37:02 +13:00
Florian Bruhin 4793070db3 Merge branch 'qt6-v2' into master-qt6 2023-03-17 20:30:13 +01:00
Florian Bruhin 9fdd737966 ci: Fix syntax 2023-03-14 12:10:45 +01:00
Florian Bruhin 72692f1580 ci: Switch branches for qt 6 image
Follow-up to 9d9a7b3b84 hopefully fixing CI on master
2023-03-14 12:08:37 +01:00
toofar 9d9a7b3b84 CI: generate archlinux-webengine-qt6 docker image
I'm not 100% sure we need this. But there is an existing test matrix
that I want to active for now. We can review all the configuration later
I guess?
2023-03-14 11:20:54 +13:00
toofar 09761e2556 CI: generate archlinux-webengine-qt6 docker image
I'm not 100% sure we need this. But there is an existing test matrix
that I want to active for now. We can review all the configuration later
I guess?
2023-03-14 11:07:31 +13:00
dependabot[bot] 370b191615
build(deps): bump docker/build-push-action from 3 to 4
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-06 18:09:26 +00:00
Florian Bruhin ab258e7aab ci: Bump timeouts to 45m
Looks like 30m is a bit tight when GHA is exceptionally busy
2023-01-19 09:51:51 +01:00
Florian Bruhin f77ccd022b Fix gathering info for nightly builds on Windows
Not quite sure why this worked with 0ff0eaa703 honestly...
2022-12-27 12:40:08 +01:00
Florian Bruhin 9bf258c8f8 doc: Improve security reporting guidelines
See #7524
2022-12-13 14:24:32 +01:00
Florian Bruhin b4d32e04f4 Merge branch 'master' into qt6-v2 2022-12-13 09:05:32 +01:00
Florian Bruhin 65440f3f1e ci: I shouldn't push changes before my first coffee 2022-12-13 08:49:06 +01:00
Florian Bruhin 549aec3100 ci: Adjust for asciidoc changes 2022-12-13 08:38:23 +01:00
Florian Bruhin 21ac559a65 More adjustments for tox 4 subtleties 2022-12-12 13:42:32 +01:00
Florian Bruhin c43bc3b445 ci: Deactivate Qt 6.4 for now
Still some stuff broken sadly, see #7314
2022-11-29 09:30:47 +01:00
Florian Bruhin a497ce69be tox/ci: Add PyQt 6.4 2022-11-24 09:26:30 +01: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 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
dependabot[bot] e8179d455f
build(deps): bump peter-evans/create-pull-request from 3 to 4
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-04 18:13:23 +00:00
Florian Bruhin 7e7eaaee7c Retry dependabot for GitHub Actions
See 78709ce2b9
and fa5e04fdaf

Hoping this will work better nowadays?

Tenatively closes #7299
2022-11-04 19:12:54 +01:00
Florian Bruhin 0ff0eaa703 ci: Get rid of set-output
Fixes #7439
2022-11-03 11:53:28 +01:00
toofar f0bfc9aab2 Document how to set the backend for the tests.
I only had the old way save in my bash history and this one was only
mentioned in the changelog.

Also changed the heading above the new entry to be title case, which
seems to be more consistent with the other headinfs in the file.

Also remove the one remaining mention of `QUTE_BDD_WEBENGINE` since it
does nothing anymore.
2022-09-16 17:13:52 +12:00
toofar 4b3ec40eb0 mypy: re-enable CI jobs for pyqt5
We'll be going forward with type checking on PyQt5 for now while
figuring out what to do with PyQt6 type checking.

See https://github.com/qutebrowser/qutebrowser/discussions/7372#discussioncomment-3502200
2022-09-11 17:31:52 +12:00
toofar c1738ca550 tox: split mypy env into mypy-{qt5,qt6}
Would be nice to have a bare `mypy` env which ran both the more specific ones
in sequence but I don't know how to do that.

Not sure if there is a way to pull the CONSTANTS_ARGS stuff out to a non-env
parameter and pass it into commands but I couldn't figure out a way. So via
the environment it is.

TODO: compare PyQt6 as-is with the WIP PyQt6-Stub
2022-09-11 10:19:44 +12:00
Florian Bruhin 769ef6859f Adjust some fixme comments 2022-08-23 18:31:42 +02:00
Florian Bruhin 0cf7453fc3 ci: Prepare Qt 6 dockerfiles 2022-08-23 18:31:41 +02:00