Skip to content

Commit b9d5d50

Browse files
committed
Fix snap build and fix emit causing bad formatting (clang-format v19+)
1 parent cbbfe09 commit b9d5d50

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.clang-format

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,7 @@ AlignEscapedNewlines: Left
106106
# initializer list in list-initialization.
107107
SpaceBeforeCpp11BracedList: false
108108

109+
# Custom styles added by this project
110+
111+
# fix for https://bugreports.qt.io/browse/QTCREATORBUG-31858
112+
StatementAttributeLikeMacros: [emit, Q_EMIT]

.github/workflows/format-lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ on:
77
jobs:
88
lint:
99
name: Format / Lint
10-
runs-on: ubuntu-latest
10+
# FIXME: ubuntu-latest has clang-format v18 which contains a bug: # https://bugreports.qt.io/browse/QTCREATORBUG-31858.
11+
# Update this once ubuntu ships clang-format v19
12+
runs-on: ubuntu-22.04
1113
strategy:
1214
fail-fast: false
1315
steps:

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ jobs:
266266

267267
snap:
268268
name: snap
269-
runs-on: ubuntu-latest
269+
runs-on: ubuntu-22.04 # FIXME: See this issue before updating to ubuntu-24.08: https://github.com/actions/runner-images/issues/9932
270270
steps:
271271
- name: Checkout code
272272
uses: actions/checkout@v4

0 commit comments

Comments
 (0)