Skip to content

Commit

Permalink
Merge branch 'feature/set-next-release-to-0.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jahnf committed Oct 13, 2023
2 parents 82d9cfa + 88434b4 commit 70f3d3d
Show file tree
Hide file tree
Showing 87 changed files with 6,783 additions and 1,329 deletions.
47 changes: 47 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
BasedOnStyle: LLVM
IndentWidth: 2
TabWidth: 2
UseTab: Never
MaxEmptyLinesToKeep: 2
ColumnLimit: 100

Language: Cpp
#LambdaBodyIndentation: OuterScope
Cpp11BracedListStyle: true
PointerAlignment: Left
ConstructorInitializerIndentWidth: '2'
ContinuationIndentWidth: 2
SortIncludes: 'true'
EmptyLineBeforeAccessModifier: Leave
BinPackArguments: 'true'
BinPackParameters: 'true'
AlignAfterOpenBracket: Align
AlignEscapedNewlines: Left
KeepEmptyLinesAtTheStartOfBlocks: true
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AlwaysBreakTemplateDeclarations: 'Yes'
AllowShortFunctionsOnASingleLine: Inline
AllowShortBlocksOnASingleLine: Always
AllowShortEnumsOnASingleLine: true
BreakConstructorInitializers: BeforeComma
BreakBeforeConceptDeclarations: 'true'
Standard: c++14
EmptyLineBeforeAccessModifier: Always
BreakBeforeBinaryOperators: NonAssignment
AlignConsecutiveAssignments: true
NamespaceIndentation: Inner
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: MultiLine
SplitEmptyFunction: false
SplitEmptyRecord: false
BeforeElse: true
BeforeLambdaBody: false


...
29 changes: 29 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
Checks: >
*,-fuchsia*,-android-*,
-modernize-pass-by-value,-modernize-use-trailing-return-type,
-llvmlibc-restrict-system-libc-headers,-llvmlibc-*,
-altera-unroll-loops,-altera-struct-pack-align,
-cppcoreguidelines-owning-memory,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,
-llvm-qualified-auto,-readability-qualified-auto,
-cppcoreguidelines-avoid-magic-numbers,
-google-build-using-namespace,
-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,
-cppcoreguidelines-pro-type-static-cast-downcast,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-readability-implicit-bool-conversion, - readability-container-size-empty,
-hicpp-signed-bitwise, -cppcoreguidelines-macro-usage,
-cppcoreguidelines-avoid-c-arrays,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,
-google-default-arguments,-google-readability-todo,
-hicpp-uppercase-literal-suffix,-readability-uppercase-literal-suffix,
-clang-analyzer-core.CallAndMessage, -readability-static-accessed-through-instance

WarningsAsErrors: false
CheckOptions:
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
value: true
- key: readability-magic-numbers.IgnorePowersOf2IntegerValues
value: true
- key: readability-magic-numbers.IgnoredIntegerValues
value: '1;2;3;4;5;6;10;24;60;100;1000;'
24 changes: 15 additions & 9 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ jobs:
matrix:
docker_tag:
- archlinux
- fedora-30
- fedora-31
- fedora-32
- fedora-33
- fedora-34
- fedora-37
- debian-stretch
- debian-buster
- debian-bullseye
- ubuntu-18.04
- ubuntu-20.04
- ubuntu-20.10
- ubuntu-21.04
- ubuntu-22.04
- opensuse-15.0
- opensuse-15.1
- opensuse-15.2
Expand All @@ -54,7 +55,11 @@ jobs:
# ===================================================================================
# ---------- Checkout and build inside docker container ----------
- uses: actions/checkout@v1
- uses: actions/checkout@v3
with:
# unfortunately, currently we need all the history for a valid auto generated version
fetch-depth: 0

- run: |
export BRANCH=${GITHUB_REF/refs\/heads\//}
echo Detected branch: ${BRANCH}
Expand Down Expand Up @@ -112,22 +117,22 @@ jobs:
# ---------- Upload artifacts to github ----------
- name: Upload source-pkg artifact to github
if: startsWith(matrix.docker_tag, 'archlinux')
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: source-package
path: ${{ env.src_pkg_artifact }}

- name: Upload version-info to github
if: startsWith(matrix.docker_tag, 'archlinux')
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: version-info
path: |
./version-string
./version-branch
- name: Upload binary package artifact to github
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.docker_tag }}-package
path: ${{ env.dist_pkg_artifact }}
Expand Down Expand Up @@ -187,11 +192,12 @@ jobs:
declare -A distromap=( ["debian-stretch"]="debian/stretch" ["debian-buster"]="debian/buster" \
["debian-bullseye"]="debian/bullseye" ["ubuntu-18.04"]="ubuntu/bionic" \
["ubuntu-20.04"]="ubuntu/focal" ["ubuntu-21.04"]="ubuntu/hirsute" \
["ubuntu-22.04"]="ubuntu/jammy" \
["opensuse-15.1"]="opensuse/15.1" ["opensuse-15.2"]="opensuse/15.2" \
["opensuse-15.3"]="opensuse/15.3" ["centos-8"]="el/8" \
["fedora-30"]="fedora/30" ["fedora-31"]="fedora/31" \
["fedora-31"]="fedora/31" \
["fedora-32"]="fedora/32" ["fedora-33"]="fedora/33" \
["fedora-34"]="fedora/34" )
["fedora-34"]="fedora/34" ["fedora-37"]="fedora/37" )
export DISTRO=${distromap[${{ matrix.docker_tag }}]}
echo PKGTYPE=$PKG_TYPE
echo DISTRO=$DISTRO
Expand Down Expand Up @@ -220,7 +226,7 @@ jobs:

steps:
- name: Get version-info
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: version-info

Expand All @@ -233,7 +239,7 @@ jobs:
DO_UPLOAD=$(( [ "master" = "$BRANCH" ] || [ "develop" = "$BRANCH" ] ) && echo true || echo false)
echo "DO_UPLOAD=${DO_UPLOAD}" >> $GITHUB_ENV
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
if: env.DO_UPLOAD == 'true'
with:
path: artifacts
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ jobs:
qt5-default libqt5x11extras5-dev
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}
# - run: git checkout HEAD^2
# if: ${{ github.event_name == 'pull_request' }}

- name: Configure and build Qt moc cpps
run: |
Expand All @@ -42,7 +42,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
queries: +security-and-quality

Expand All @@ -52,4 +52,4 @@ jobs:
make -j2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ CMakeLists.txt.user*
.vscode
.idea
*.code-workspace
build
build-*
build/*
icons/icon-font/output/
6 changes: 4 additions & 2 deletions 55-projecteur.rules.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c53e", MODE="0660
# Rule fot the Logitech Spotlight when connected via Bluetooth
# Updated rule, thanks to Torsten Maehne (https://github.com/maehne)
SUBSYSTEMS=="input", ENV{LIBINPUT_DEVICE_GROUP}="5/46d/b503*", ATTRS{name}=="SPOTLIGHT*", MODE="0660", TAG+="uaccess"
# Additional rule for Bluetooth sub-devices (hidraw)
SUBSYSTEMS=="hid", KERNELS=="0005:046D:B503.*", MODE="0660", TAG+="uaccess"

# Additional supported Bluetooth devices @EXTRA_BLUETOOTH_UDEV_RULES@

# Rules for uninput: Essential for creating a virtual input device that
# Projecteur use for forwarding device events to the system after grabbing it
# Rules for uinput: Essential for creating a virtual input device that
# Projecteur uses to forward device events to the system after grabbing it
KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
Loading

0 comments on commit 70f3d3d

Please sign in to comment.