2 files changed, 5 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format
index adb43177..f26fc328 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,6 +1,6 @@
---
Language: Cpp
-Standard: c++17
+Standard: c++20
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true
@@ -15,4 +15,4 @@ Cpp11BracedListStyle: true
PenaltyReturnTypeOnItsOwnLine: 0
---
BasedOnStyle: WebKit
-Language: ObjC
\ No newline at end of file
+Language: ObjC
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13fe25dd..eed0f229 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -454,8 +454,9 @@ linting:
tags: [docker]
before_script:
- apk update && apk add make git python3 py3-pip qt6-qtdeclarative-dev
- - apk add clang-extra-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
- - export PATH="$PATH:/root/.local/bin"
+ # clang18 seems to mess with the emit keyword when using the `->` operator
+ - apk add clang17-extra-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+ - export PATH="$PATH:/usr/lib/llvm17/bin/:/root/.local/bin"
- pip3 install --break-system-packages --user reuse
script:
- make lint
|