Skip to content

Commit

Permalink
style: Fix formatting of YAML files using prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Holzhaus committed Oct 19, 2022
1 parent d0dfda1 commit 90bdba6
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 172 deletions.
9 changes: 4 additions & 5 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
# Common configuration for all languages
BasedOnStyle: Google
IndentWidth: 4
TabWidth: 8
UseTab: Never
IndentWidth: 4
TabWidth: 8
UseTab: Never
# A ColumnLimit > 0 causes clang-format to unbreaks all short lines,
# which is undesired here.
# If the line length exceeds 100, "ColumnLimit: 80" is used in scripts/line-length.py
ColumnLimit: 0
ColumnLimit: 0
---
Language: Cpp
Standard: c++17
Expand Down Expand Up @@ -49,4 +49,3 @@ DisableFormat: true
Language: Proto
# Don't format .proto files yet
DisableFormat: true
...
31 changes: 15 additions & 16 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
---
Checks: '-*,modernize-use-bool-literals,modernize-use-nullptr,modernize-use-override,readability-braces-around-statements,readability-namespace-comment,readability-non-const-parameter,readability-qualified-auto'
WarningsAsErrors: ''
HeaderFilterRegex: ''
Checks: "-*,modernize-use-bool-literals,modernize-use-nullptr,modernize-use-override,readability-braces-around-statements,readability-namespace-comment,readability-non-const-parameter,readability-qualified-auto"
WarningsAsErrors: ""
HeaderFilterRegex: ""
AnalyzeTemporaryDtors: false
FormatStyle: none
User: user
FormatStyle: none
User: user
CheckOptions:
- key: readability-braces-around-statements.ShortStatementLines
value: 0
- key: readability-namespace-comments.ShortNamespaceLines
value: 0
- key: readability-namespace-comments.SpacesBeforeComments
value: 1
- key: readability-qualified-auto.AddConstToQualified
value: true
- key: modernize-use-nullptr.NullMacros
value: 'NULL'
...
- key: readability-braces-around-statements.ShortStatementLines
value: 0
- key: readability-namespace-comments.ShortNamespaceLines
value: 0
- key: readability-namespace-comments.SpacesBeforeComments
value: 1
- key: readability-qualified-auto.AddConstToQualified
value: true
- key: modernize-use-nullptr.NullMacros
value: "NULL"
36 changes: 18 additions & 18 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
build:
- default.nix
- CMakeLists.txt
- build/**
- cmake/**
- default.nix
- CMakeLists.txt
- build/**
- cmake/**

code quality:
- src/test/**
- .clang-format
- .codespell
- .eslint*
- .flake8
- .pre-commit-config.yaml
- pyproject.toml
- src/test/**
- .clang-format
- .codespell
- .eslint*
- .flake8
- .pre-commit-config.yaml
- pyproject.toml

controllers:
- res/controllers/**
- res/controllers/**

library:
- src/library/**
- src/library/**

skins:
- res/skins/**
- res/skins/**

ui:
- src/**.ui
- src/dialog/**
- src/preferences/**
- src/widget/**
- src/**.ui
- src/dialog/**
- src/preferences/**
- src/widget/**
204 changes: 102 additions & 102 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,105 +16,105 @@ jobs:
runs-on: ubuntu-20.04
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Install build dependencies
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
libavformat-dev \
libchromaprint-dev \
libebur128-dev \
libfftw3-dev \
libflac-dev \
libid3tag0-dev \
liblilv-dev \
libmad0-dev \
libmodplug-dev \
libmp3lame-dev \
libopus-dev \
libopusfile-dev \
libportmidi-dev \
libprotobuf-dev \
libqt5opengl5-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
libqt5x11extras5-dev \
librubberband-dev \
libshout-idjc-dev \
libsndfile1-dev \
libsoundtouch-dev \
libsqlite3-dev \
libtag1-dev \
libupower-glib-dev \
libusb-1.0-0-dev \
libwavpack-dev \
portaudio19-dev \
protobuf-compiler \
qt5-default \
qtscript5-dev \
qt5keychain-dev \
clazy \
clang-tidy \
cmake
- name: Create build directory
run: mkdir build
- name: Configure (clazy)
if: matrix.name == 'clazy'
# Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DWARNINGS_FATAL=ON \
-DOPTIMIZE=off \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
-DHID=ON \
-DLILV=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
-DVINYLCONTROL=ON \
-DFFMPEG=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
..
working-directory: build
env:
LD: clang++
CC: clang
CXX: clazy
- name: Configure (clang-tidy)
if: matrix.name == 'clang-tidy'
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCLANG_TIDY=clang-tidy \
-DWARNINGS_FATAL=ON \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
-DHID=ON \
-DLILV=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
-DVINYLCONTROL=ON \
-DFFMPEG=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@master
- name: Build
# Do not abort on errors and build/check the whole project
run: cmake --build . -j $(nproc) -- --keep-going
working-directory: build
env:
CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event
CLAZY_IGNORE_DIRS: lib/.*
- name: Check out repository
uses: actions/checkout@v3
- name: Install build dependencies
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
libavformat-dev \
libchromaprint-dev \
libebur128-dev \
libfftw3-dev \
libflac-dev \
libid3tag0-dev \
liblilv-dev \
libmad0-dev \
libmodplug-dev \
libmp3lame-dev \
libopus-dev \
libopusfile-dev \
libportmidi-dev \
libprotobuf-dev \
libqt5opengl5-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
libqt5x11extras5-dev \
librubberband-dev \
libshout-idjc-dev \
libsndfile1-dev \
libsoundtouch-dev \
libsqlite3-dev \
libtag1-dev \
libupower-glib-dev \
libusb-1.0-0-dev \
libwavpack-dev \
portaudio19-dev \
protobuf-compiler \
qt5-default \
qtscript5-dev \
qt5keychain-dev \
clazy \
clang-tidy \
cmake
- name: Create build directory
run: mkdir build
- name: Configure (clazy)
if: matrix.name == 'clazy'
# Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DWARNINGS_FATAL=ON \
-DOPTIMIZE=off \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
-DHID=ON \
-DLILV=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
-DVINYLCONTROL=ON \
-DFFMPEG=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
..
working-directory: build
env:
LD: clang++
CC: clang
CXX: clazy
- name: Configure (clang-tidy)
if: matrix.name == 'clang-tidy'
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCLANG_TIDY=clang-tidy \
-DWARNINGS_FATAL=ON \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
-DHID=ON \
-DLILV=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
-DVINYLCONTROL=ON \
-DFFMPEG=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@master
- name: Build
# Do not abort on errors and build/check the whole project
run: cmake --build . -j $(nproc) -- --keep-going
working-directory: build
env:
CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event
CLAZY_IGNORE_DIRS: lib/.*
24 changes: 12 additions & 12 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
name: Trigger Changelog update on manual repository
runs-on: ubuntu-latest
steps:
- name: Get current branch name
uses: nelonoel/[email protected]
- name: Start workflow run on manual repository
uses: peter-evans/repository-dispatch@v1
if: env.MIXXXBOT_TOKEN != null
with:
token: ${{ env.MIXXXBOT_TOKEN }}
repository: mixxxdj/manual
event-type: update-changelog
client-payload: '{"branch": "${{ env.BRANCH_NAME }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
env:
MIXXXBOT_TOKEN: ${{ secrets.MIXXXBOT_CHANGELOG_AUTOUPDATER_PAT }}
- name: Get current branch name
uses: nelonoel/[email protected]
- name: Start workflow run on manual repository
uses: peter-evans/repository-dispatch@v1
if: env.MIXXXBOT_TOKEN != null
with:
token: ${{ env.MIXXXBOT_TOKEN }}
repository: mixxxdj/manual
event-type: update-changelog
client-payload: '{"branch": "${{ env.BRANCH_NAME }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
env:
MIXXXBOT_TOKEN: ${{ secrets.MIXXXBOT_CHANGELOG_AUTOUPDATER_PAT }}
16 changes: 8 additions & 8 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@

name: "Pull Request Labeler"
on:
- pull_request_target
- pull_request_target

jobs:
triage:
runs-on: ubuntu-latest

steps:
- uses: actions/labeler@main
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
- uses: actions/labeler@main
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"

# This works around bug https://github.com/actions/labeler/issues/104.
# The workaround was proposed here:
# https://github.com/wesnoth/wesnoth/commit/958c82d0867568057caaf58356502ec8c87d8366
sync-labels: ""
# This works around bug https://github.com/actions/labeler/issues/104.
# The workaround was proposed here:
# https://github.com/wesnoth/wesnoth/commit/958c82d0867568057caaf58356502ec8c87d8366
sync-labels: ""
22 changes: 11 additions & 11 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
name: "Detect stale issues"
on:
schedule:
- cron: "0 0 * * *"
- cron: "0 0 * * *"

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: "This issue is marked as stale because it has been open 90 days with no activity."
stale-issue-label: "stale"
stale-pr-message: "This PR is marked as stale because it has been open 90 days with no activity."
stale-pr-label: "stale"
days-before-stale: 90
days-before-close: -1
exempt-pr-labels: "needs review"
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: "This issue is marked as stale because it has been open 90 days with no activity."
stale-issue-label: "stale"
stale-pr-message: "This PR is marked as stale because it has been open 90 days with no activity."
stale-pr-label: "stale"
days-before-stale: 90
days-before-close: -1
exempt-pr-labels: "needs review"

0 comments on commit 90bdba6

Please sign in to comment.