Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Linux-GitHub runner to Ubuntu 24.04.01 LTS #13781

Merged
merged 13 commits into from
Nov 11, 2024
Merged

Update Linux-GitHub runner to Ubuntu 24.04.01 LTS #13781

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0bde346
Update runner for Linux build to Ubuntu 24.04.01 LTS
JoergAtGithub Oct 18, 2024
257488d
Update build-checks to Ubuntu 24.04.01 LTS and use Clazy v1.12
JoergAtGithub Oct 18, 2024
692c64e
Reduced include scope from module include of QtQml by class include o…
JoergAtGithub Oct 20, 2024
658faa7
Enable clazy module include check
JoergAtGithub Oct 20, 2024
a837df6
Removed module wide include of QtSql and added class includes where n…
JoergAtGithub Oct 20, 2024
e487fc4
Removed module wide include of QtConcurrent and added sub includes wh…
JoergAtGithub Oct 20, 2024
aef67fa
Merge remote-tracking branch 'upstream/main' into ubuntu_240401
JoergAtGithub Oct 20, 2024
2f3f826
Removed module wide include of QtDbus and added class includes instead
JoergAtGithub Oct 20, 2024
57c09d9
Merge remote-tracking branch 'upstream/main' into ubuntu_240401
JoergAtGithub Nov 4, 2024
46d98ad
Add clazy PPA to work around the outdated clazy 1.11 version
daschuer Nov 7, 2024
aa05940
Restore lost clazy version printout, and only install clazy for the c…
JoergAtGithub Nov 10, 2024
3a58cd0
Merge remote-tracking branch 'upstream/main' into ubuntu_240401
JoergAtGithub Nov 11, 2024
4142e7f
Add comments at the issue locations, that we don't forget to remove -…
JoergAtGithub Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v4.2.1
uses: actions/checkout@v4.2.2
- name: Add clazy PPA
if: matrix.name == 'clazy'
# Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ repos:
hooks:
- id: shellcheck
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.14.0
rev: v0.15.0
hooks:
- id: markdownlint-cli2
- repo: https://github.com/python-jsonschema/check-jsonschema
Expand All @@ -124,7 +124,7 @@ repos:
- id: prettier
types: [yaml]
- repo: https://github.com/qarmin/qml_formatter.git
rev: 37c2513b1b8275a475a160ed2f5b044910335d5f # No release tag yet including #6 fix
rev: latest # No release tag yet including #6 fix
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be reverted... pre-commit does that automatically unfortunately when running autoupdate.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opened PR #13880, which reverts this unintended change.

hooks:
- id: qml_formatter
- repo: local
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.