Format YAML and JSON Files With Prettier (#4304)

* ci: format yaml and json files with prettier

* chore: add changelog entry

* fix: format everything

* ci: run pretter on all files

* ci: rename prettier step
This commit is contained in:
nerix 2023-01-15 17:27:41 +01:00 committed by GitHub
parent f933d9cdf2
commit 2233b46512
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 303 additions and 268 deletions

View file

@ -3,7 +3,7 @@ freebsd_instance:
task: task:
install_script: install_script:
- pkg install -y boost-libs git qt5-buildtools qt5-concurrent qt5-core qt5-multimedia qt5-svg qtkeychain-qt5 qt5-qmake cmake qt5-linguist - pkg install -y boost-libs git qt5-buildtools qt5-concurrent qt5-core qt5-multimedia qt5-svg qtkeychain-qt5 qt5-qmake cmake qt5-linguist
script: | script: |
git submodule init git submodule init
git submodule update git submodule update

View file

@ -1,56 +1,56 @@
Checks: '-*, Checks: "-*,
clang-diagnostic-*, clang-diagnostic-*,
llvm-*, llvm-*,
misc-*, misc-*,
-misc-unused-parameters, -misc-unused-parameters,
readability-identifier-naming, readability-identifier-naming,
-llvm-header-guard, -llvm-header-guard,
-llvm-include-order, -llvm-include-order,
modernize-*, modernize-*,
readability-*, readability-*,
performance-*, performance-*,
misc-*, misc-*,
bugprone-*, bugprone-*,
cert-*, cert-*,
cppcoreguidelines-*, cppcoreguidelines-*,
-cppcoreguidelines-pro-type-cstyle-cast, -cppcoreguidelines-pro-type-cstyle-cast,
-cppcoreguidelines-pro-bounds-pointer-arithmetic, -cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay, -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-cppcoreguidelines-pro-type-member-init, -cppcoreguidelines-pro-type-member-init,
-cppcoreguidelines-owning-memory, -cppcoreguidelines-owning-memory,
-cppcoreguidelines-avoid-magic-numbers, -cppcoreguidelines-avoid-magic-numbers,
-readability-magic-numbers, -readability-magic-numbers,
-performance-noexcept-move-constructor, -performance-noexcept-move-constructor,
-misc-non-private-member-variables-in-classes, -misc-non-private-member-variables-in-classes,
-cppcoreguidelines-non-private-member-variables-in-classes, -cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-special-member-functions, -cppcoreguidelines-special-member-functions,
-modernize-use-nodiscard, -modernize-use-nodiscard,
-modernize-use-trailing-return-type, -modernize-use-trailing-return-type,
-readability-identifier-length, -readability-identifier-length,
-readability-function-cognitive-complexity, -readability-function-cognitive-complexity,
-bugprone-easily-swappable-parameters, -bugprone-easily-swappable-parameters,
-cert-err58-cpp, -cert-err58-cpp,
' "
CheckOptions: CheckOptions:
- key: readability-identifier-naming.ClassCase - key: readability-identifier-naming.ClassCase
value: CamelCase value: CamelCase
- key: readability-identifier-naming.EnumCase - key: readability-identifier-naming.EnumCase
value: CamelCase value: CamelCase
- key: readability-identifier-naming.FunctionCase - key: readability-identifier-naming.FunctionCase
value: camelBack value: camelBack
- key: readability-identifier-naming.MemberCase - key: readability-identifier-naming.MemberCase
value: camelBack value: camelBack
- key: readability-identifier-naming.PrivateMemberIgnoredRegexp - key: readability-identifier-naming.PrivateMemberIgnoredRegexp
value: .* value: .*
- key: readability-identifier-naming.PrivateMemberSuffix - key: readability-identifier-naming.PrivateMemberSuffix
value: _ value: _
- key: readability-identifier-naming.ProtectedMemberSuffix - key: readability-identifier-naming.ProtectedMemberSuffix
value: _ value: _
- key: readability-identifier-naming.UnionCase - key: readability-identifier-naming.UnionCase
value: CamelCase value: CamelCase
- key: readability-identifier-naming.GlobalConstantCase - key: readability-identifier-naming.GlobalConstantCase
value: UPPER_CASE value: UPPER_CASE
- key: readability-identifier-naming.VariableCase - key: readability-identifier-naming.VariableCase
value: camelBack value: camelBack
- key: readability-implicit-bool-conversion.AllowPointerConditions - key: readability-implicit-bool-conversion.AllowPointerConditions
value: true value: true

2
.github/FUNDING.yml vendored
View file

@ -1 +1 @@
custom: "https://streamelements.com/fourtf/tip" custom: "https://streamelements.com/fourtf/tip"

View file

@ -6,48 +6,47 @@ body:
- type: checkboxes - type: checkboxes
id: acknowledgments id: acknowledgments
attributes: attributes:
label: Checklist label: Checklist
description: description:
options: options:
- label: I'm reporting a problem with Chatterino - label: I'm reporting a problem with Chatterino
required: true required: true
- label: I've verified that I'm running **the most** recent nightly build or stable release - label: I've verified that I'm running **the most** recent nightly build or stable release
required: true required: true
- label: I've looked for my problem on the [wiki](https://wiki.chatterino.com/Help/) - label: I've looked for my problem on the [wiki](https://wiki.chatterino.com/Help/)
required: true required: true
- label: I've searched the [issues and pull requests](https://github.com/Chatterino/chatterino2/issues?q=) for similar looking reports - label: I've searched the [issues and pull requests](https://github.com/Chatterino/chatterino2/issues?q=) for similar looking reports
required: true required: true
- type: textarea - type: textarea
id: description id: description
validations: validations:
required: true required: true
attributes: attributes:
label: Describe your issue label: Describe your issue
description: | description: |
Write a brief description of your issue. Write a brief description of your issue.
Important: Important:
Focus on the problem instead of a concrete solution. This ensures that the focus of the thread is to resolve your issue. Focus on the problem instead of a concrete solution. This ensures that the focus of the thread is to resolve your issue.
If you want to voice a concrete idea you can add a comment below after posting the issue. If you want to voice a concrete idea you can add a comment below after posting the issue.
placeholder: | placeholder: |
Examples: Examples:
- I cannot do X. - I cannot do X.
- I have trouble doing X. - I have trouble doing X.
- Feature X has stopped working for me. - Feature X has stopped working for me.
- type: textarea - type: textarea
id: screenshots id: screenshots
attributes: attributes:
label: Screenshots label: Screenshots
description: While optional, it's highly encouraged to include screenshots or videos to illustrate what you mean. description: While optional, it's highly encouraged to include screenshots or videos to illustrate what you mean.
placeholder: You can upload them using the text editor's dedicated button. placeholder: You can upload them using the text editor's dedicated button.
- type: input - type: input
id: versions id: versions
validations: validations:
required: true required: true
attributes: attributes:
label: OS and Chatterino Version label: OS and Chatterino Version
description: The name of your Operating System and the version shown in Chatterino's about settings page (⚙ -> about tab). description: The name of your Operating System and the version shown in Chatterino's about settings page (⚙ -> about tab).
placeholder: Chatterino 2.3.5 (commit 81a62764, 2022-04-05) on Windows 10 Version 2009, kernel 10.0.19043 placeholder: Chatterino 2.3.5 (commit 81a62764, 2022-04-05) on Windows 10 Version 2009, kernel 10.0.19043

View file

@ -1,11 +1,11 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Issue about the Chatterino Browser Extension - name: Issue about the Chatterino Browser Extension
url: https://github.com/Chatterino/chatterino-browser-ext/issues url: https://github.com/Chatterino/chatterino-browser-ext/issues
about: Make a suggestion or report a bug about the Chatterino browser extension. about: Make a suggestion or report a bug about the Chatterino browser extension.
- name: Suggestions or feature request - name: Suggestions or feature request
url: https://github.com/chatterino/chatterino2/discussions/categories/ideas url: https://github.com/chatterino/chatterino2/discussions/categories/ideas
about: Got something you think should change or be added? Search for or start a new discussion! about: Got something you think should change or be added? Search for or start a new discussion!
- name: Help - name: Help
url: https://github.com/chatterino/chatterino2/discussions/categories/q-a url: https://github.com/chatterino/chatterino2/discussions/categories/q-a
about: Chatterino2 not working as you'd expect? Not sure it's a bug? Check the Q&A section! about: Chatterino2 not working as you'd expect? Not sure it's a bug? Check the Q&A section!

View file

@ -35,19 +35,19 @@ jobs:
- name: Force LTO - name: Force LTO
if: matrix.force-lto == true if: matrix.force-lto == true
run: | run: |
echo "C2_ENABLE_LTO=ON" >> "$GITHUB_ENV" echo "C2_ENABLE_LTO=ON" >> "$GITHUB_ENV"
shell: bash shell: bash
- name: Set environment variables for windows-latest - name: Set environment variables for windows-latest
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
run: | run: |
echo "vs_version=2022" >> "$GITHUB_ENV" echo "vs_version=2022" >> "$GITHUB_ENV"
shell: bash shell: bash
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true
fetch-depth: 0 # allows for tags access fetch-depth: 0 # allows for tags access
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3.0.0 uses: jurplel/install-qt-action@v3.0.0
@ -63,7 +63,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.txt') }} key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.txt') }}
path: ~/.conan/ path: ~/.conan/
- name: Cache conan packages part 2 - name: Cache conan packages part 2
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
@ -79,7 +79,7 @@ jobs:
- name: Install dependencies (Windows) - name: Install dependencies (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | run: |
choco install conan -y choco install conan -y
- name: Enable Developer Command Prompt - name: Enable Developer Command Prompt
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
@ -88,21 +88,21 @@ jobs:
- name: Build (Windows) - name: Build (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | run: |
mkdir build mkdir build
cd build cd build
conan install .. -b missing conan install .. -b missing
cmake ` cmake `
-G"NMake Makefiles" ` -G"NMake Makefiles" `
-DCMAKE_BUILD_TYPE=Release ` -DCMAKE_BUILD_TYPE=Release `
-DUSE_CONAN=ON ` -DUSE_CONAN=ON `
-DCHATTERINO_LTO="$Env:C2_ENABLE_LTO" ` -DCHATTERINO_LTO="$Env:C2_ENABLE_LTO" `
.. ..
set cl=/MP set cl=/MP
nmake /S /NOLOGO nmake /S /NOLOGO
windeployqt bin/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/ windeployqt bin/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/
cp bin/chatterino.exe Chatterino2/ cp bin/chatterino.exe Chatterino2/
echo nightly > Chatterino2/modes echo nightly > Chatterino2/modes
7z a chatterino-windows-x86-64.zip Chatterino2/ 7z a chatterino-windows-x86-64.zip Chatterino2/
- name: Upload artifact (Windows) - name: Upload artifact (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
@ -120,42 +120,42 @@ jobs:
- name: Install dependencies (Ubuntu) - name: Install dependencies (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -y install \ sudo apt-get -y install \
cmake \ cmake \
virtualenv \ virtualenv \
rapidjson-dev \ rapidjson-dev \
libfuse2 \ libfuse2 \
libssl-dev \ libssl-dev \
libboost-dev \ libboost-dev \
libxcb-randr0-dev \ libxcb-randr0-dev \
libboost-system-dev \ libboost-system-dev \
libboost-filesystem-dev \ libboost-filesystem-dev \
libpulse-dev \ libpulse-dev \
libxkbcommon-x11-0 \ libxkbcommon-x11-0 \
libgstreamer-plugins-base1.0-0 \ libgstreamer-plugins-base1.0-0 \
build-essential \ build-essential \
libgl1-mesa-dev \ libgl1-mesa-dev \
libxcb-icccm4 \ libxcb-icccm4 \
libxcb-image0 \ libxcb-image0 \
libxcb-keysyms1 \ libxcb-keysyms1 \
libxcb-render-util0 \ libxcb-render-util0 \
libxcb-xinerama0 libxcb-xinerama0
- name: Build (Ubuntu) - name: Build (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
mkdir build mkdir build
cd build cd build
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=appdir/usr/ \ -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \ -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
-DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \ -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=On \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
-DCHATTERINO_LTO="$C2_ENABLE_LTO" \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
.. ..
make -j"$(nproc)" make -j"$(nproc)"
shell: bash shell: bash
- name: clang-tidy review - name: clang-tidy review
@ -164,7 +164,7 @@ jobs:
id: review id: review
with: with:
build_dir: build build_dir: build
config_file: '.clang-tidy' config_file: ".clang-tidy"
split_workflow: true split_workflow: true
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
@ -178,15 +178,15 @@ jobs:
- name: Package - AppImage (Ubuntu) - name: Package - AppImage (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
cd build cd build
sh ./../.CI/CreateAppImage.sh sh ./../.CI/CreateAppImage.sh
shell: bash shell: bash
- name: Package - .deb (Ubuntu) - name: Package - .deb (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
cd build cd build
sh ./../.CI/CreateUbuntuDeb.sh sh ./../.CI/CreateUbuntuDeb.sh
shell: bash shell: bash
- name: Upload artifact - AppImage (Ubuntu) - name: Upload artifact - AppImage (Ubuntu)
@ -207,32 +207,32 @@ jobs:
- name: Install dependencies (MacOS) - name: Install dependencies (MacOS)
if: startsWith(matrix.os, 'macos') if: startsWith(matrix.os, 'macos')
run: | run: |
brew install boost openssl rapidjson p7zip create-dmg cmake tree brew install boost openssl rapidjson p7zip create-dmg cmake tree
shell: bash shell: bash
- name: Build (MacOS) - name: Build (MacOS)
if: startsWith(matrix.os, 'macos') if: startsWith(matrix.os, 'macos')
run: | run: |
mkdir build mkdir build
cd build cd build
cmake \ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \ -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \
-DCHATTERINO_LTO="$C2_ENABLE_LTO" \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
.. ..
make -j"$(sysctl -n hw.logicalcpu)" make -j"$(sysctl -n hw.logicalcpu)"
shell: bash shell: bash
- name: Package (MacOS) - name: Package (MacOS)
if: startsWith(matrix.os, 'macos') if: startsWith(matrix.os, 'macos')
run: | run: |
ls -la ls -la
pwd pwd
ls -la build || true ls -la build || true
cd build cd build
sh ./../.CI/CreateDMG.sh sh ./../.CI/CreateDMG.sh
shell: bash shell: bash
- name: Upload artifact (MacOS) - name: Upload artifact (MacOS)

View file

@ -2,8 +2,8 @@ name: Changelog Check
on: on:
pull_request: pull_request:
branches: [ master ] branches: [master]
types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
jobs: jobs:
check-changelog: check-changelog:
@ -13,5 +13,5 @@ jobs:
- name: Changelog check - name: Changelog check
uses: dangoslen/changelog-enforcer@v3 uses: dangoslen/changelog-enforcer@v3
with: with:
changeLogPath: 'CHANGELOG.md' changeLogPath: "CHANGELOG.md"
skipLabels: 'no changelog entry needed, ci, submodules' skipLabels: "no changelog entry needed, ci, submodules"

View file

@ -7,7 +7,7 @@ on:
- master - master
pull_request: pull_request:
concurrency: concurrency:
group: check-formatting-${{ github.ref }} group: check-formatting-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

View file

@ -1,9 +1,9 @@
name: 'Publish Homebrew Cask on Release' name: "Publish Homebrew Cask on Release"
on: on:
push: push:
tags: tags:
# Should match semver for mainline releases (not including -beta) # Should match semver for mainline releases (not including -beta)
- 'v2.[0-9]+.[0-9]+' - "v2.[0-9]+.[0-9]+"
# TODO: handle beta and nightly releases # TODO: handle beta and nightly releases
# Need to make those casks manually first # Need to make those casks manually first
# - v2.[0-9]+.[0-9]+-beta(?:[0-9]+) # - v2.[0-9]+.[0-9]+-beta(?:[0-9]+)
@ -16,8 +16,8 @@ env:
jobs: jobs:
update_stable_homebrew_cask: update_stable_homebrew_cask:
name: 'Update the stable homebrew cask' name: "Update the stable homebrew cask"
runs-on: 'macos-latest' runs-on: "macos-latest"
steps: steps:
# Pulls out the version from the ref (e.g. refs/tags/v2.3.1 -> 2.3.1) # Pulls out the version from the ref (e.g. refs/tags/v2.3.1 -> 2.3.1)
- name: Execute brew bump-cask-pr with version - name: Execute brew bump-cask-pr with version

View file

@ -7,7 +7,7 @@ on:
- master - master
pull_request: pull_request:
concurrency: concurrency:
group: lint-${{ github.ref }} group: lint-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
@ -18,8 +18,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Lint Markdown files - name: Check formatting with Prettier
uses: actionsx/prettier@v2 uses: actionsx/prettier@v2
with: with:
# prettier CLI arguments. # prettier CLI arguments.
args: --check '**/*.md' args: --check .

View file

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: 'Download artifact' - name: "Download artifact"
uses: actions/github-script@v6 uses: actions/github-script@v6
with: with:
script: | script: |
@ -32,7 +32,7 @@ jobs:
}); });
const fs = require('fs'); const fs = require('fs');
fs.writeFileSync('${{github.workspace}}/clang-tidy-review.zip', Buffer.from(download.data)); fs.writeFileSync('${{github.workspace}}/clang-tidy-review.zip', Buffer.from(download.data));
- name: 'Unzip artifact' - name: "Unzip artifact"
run: unzip clang-tidy-review.zip run: unzip clang-tidy-review.zip
- uses: ZedThree/clang-tidy-review/post@v0.10.1 - uses: ZedThree/clang-tidy-review/post@v0.10.1

View file

@ -6,7 +6,7 @@ on:
branches: branches:
- master - master
concurrency: concurrency:
group: build-archlinux-${{ github.ref }} group: build-archlinux-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

View file

@ -8,7 +8,7 @@ on:
env: env:
TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.5 TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.5
concurrency: concurrency:
group: test-${{ github.ref }} group: test-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
@ -45,46 +45,46 @@ jobs:
- name: Install dependencies (Ubuntu) - name: Install dependencies (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -y install \ sudo apt-get -y install \
cmake \ cmake \
rapidjson-dev \ rapidjson-dev \
libssl-dev \ libssl-dev \
libboost-dev \ libboost-dev \
libboost-system-dev \ libboost-system-dev \
libboost-filesystem-dev \ libboost-filesystem-dev \
libpulse-dev \ libpulse-dev \
libxkbcommon-x11-0 \ libxkbcommon-x11-0 \
libgstreamer-plugins-base1.0-0 \ libgstreamer-plugins-base1.0-0 \
build-essential \ build-essential \
libgl1-mesa-dev \ libgl1-mesa-dev \
libxcb-icccm4 \ libxcb-icccm4 \
libxcb-image0 \ libxcb-image0 \
libxcb-keysyms1 \ libxcb-keysyms1 \
libxcb-render-util0 \ libxcb-render-util0 \
libxcb-xinerama0 libxcb-xinerama0
- name: Create build directory (Ubuntu) - name: Create build directory (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
mkdir build-test mkdir build-test
shell: bash shell: bash
- name: Build (Ubuntu) - name: Build (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
cmake -DBUILD_TESTS=On -DBUILD_APP=OFF .. cmake -DBUILD_TESTS=On -DBUILD_APP=OFF ..
cmake --build . --config Release cmake --build . --config Release
working-directory: build-test working-directory: build-test
shell: bash shell: bash
- name: Test (Ubuntu) - name: Test (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: | run: |
docker pull kennethreitz/httpbin docker pull kennethreitz/httpbin
docker pull ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }} docker pull ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
docker run --network=host --detach ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }} docker run --network=host --detach ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
docker run -p 9051:80 --detach kennethreitz/httpbin docker run -p 9051:80 --detach kennethreitz/httpbin
./bin/chatterino-test --platform minimal || ./bin/chatterino-test --platform minimal || ./bin/chatterino-test --platform minimal ./bin/chatterino-test --platform minimal || ./bin/chatterino-test --platform minimal || ./bin/chatterino-test --platform minimal
working-directory: build-test working-directory: build-test
shell: bash shell: bash

View file

@ -1,6 +1,23 @@
# emoji.json should remain minified
resources/emoji.json
# Ignore submodule files # Ignore submodule files
lib/*/ lib/*/
conan-pkgs/*/ conan-pkgs/*/
cmake/sanitizers-cmake/ cmake/sanitizers-cmake/
.github/ # Build folders
*build-*/
[bB]uild
/_build/
# Editors
.vscode
.vs
.idea
dependencies
.cache
.editorconfig
# vcpkg
vcpkg_installed/

6
.prettierrc Normal file
View file

@ -0,0 +1,6 @@
trailingComma: es5
endOfLine: auto
overrides:
- files: "*.md"
options:
proseWrap: preserve

View file

@ -1,6 +0,0 @@
trailingComma = "es5"
[[overrides]]
files = ["*.md"]
[overrides.options]
proseWrap = "preserve"

View file

@ -35,6 +35,7 @@
- Dev: Fixed `inconsistent-missing-override` warnings. (#4296) - Dev: Fixed `inconsistent-missing-override` warnings. (#4296)
- Dev: Fixed `final-dtor-non-final-class` warnings. (#4296) - Dev: Fixed `final-dtor-non-final-class` warnings. (#4296)
- Dev: Fixed `ambiguous-reversed-operator` warnings. (#4296) - Dev: Fixed `ambiguous-reversed-operator` warnings. (#4296)
- Dev: Format YAML and JSON files with prettier. (#4304)
## 2.4.0 ## 2.4.0

View file

@ -9,14 +9,13 @@ AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakBeforeMultilineStrings: false AlwaysBreakBeforeMultilineStrings: false
BasedOnStyle: Google BasedOnStyle: Google
BraceWrapping: { BraceWrapping:
AfterClass: 'true' AfterClass: "true"
AfterControlStatement: 'true' AfterControlStatement: "true"
AfterFunction: 'true' AfterFunction: "true"
AfterNamespace: 'false' AfterNamespace: "false"
BeforeCatch: 'true' BeforeCatch: "true"
BeforeElse: 'true' BeforeElse: "true"
}
BreakBeforeBraces: Custom BreakBeforeBraces: Custom
BreakConstructorInitializersBeforeComma: true BreakConstructorInitializersBeforeComma: true
ColumnLimit: 80 ColumnLimit: 80
@ -27,7 +26,28 @@ IndentCaseLabels: true
IndentWidth: 4 IndentWidth: 4
IndentWrappedFunctionNames: true IndentWrappedFunctionNames: true
IndentPPDirectives: AfterHash IndentPPDirectives: AfterHash
IncludeBlocks: Preserve SortIncludes: CaseInsensitive
IncludeBlocks: Regroup
IncludeCategories:
# Project includes
- Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$'
Priority: 1
# Third party library includes
- Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>'
Priority: 3
# Qt includes
- Regex: '^<Q[a-zA-Z0-9\._\/-]+>$'
Priority: 3
CaseSensitive: true
# LibCommuni includes
- Regex: "^<Irc[a-zA-Z]+>$"
Priority: 3
# Misc libraries
- Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$'
Priority: 3
# Standard library includes
- Regex: "^<[a-zA-Z_]+>$"
Priority: 4
NamespaceIndentation: Inner NamespaceIndentation: Inner
PointerBindsToType: false PointerBindsToType: false
SpacesBeforeTrailingComments: 2 SpacesBeforeTrailingComments: 2

View file

@ -9,14 +9,13 @@ AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakBeforeMultilineStrings: false AlwaysBreakBeforeMultilineStrings: false
BasedOnStyle: Google BasedOnStyle: Google
BraceWrapping: { BraceWrapping:
AfterClass: 'true' AfterClass: "true"
AfterControlStatement: 'true' AfterControlStatement: "true"
AfterFunction: 'true' AfterFunction: "true"
AfterNamespace: 'false' AfterNamespace: "false"
BeforeCatch: 'true' BeforeCatch: "true"
BeforeElse: 'true' BeforeElse: "true"
}
BreakBeforeBraces: Custom BreakBeforeBraces: Custom
BreakConstructorInitializersBeforeComma: true BreakConstructorInitializersBeforeComma: true
ColumnLimit: 80 ColumnLimit: 80
@ -30,24 +29,24 @@ IndentPPDirectives: AfterHash
SortIncludes: CaseInsensitive SortIncludes: CaseInsensitive
IncludeBlocks: Regroup IncludeBlocks: Regroup
IncludeCategories: IncludeCategories:
# Project includes # Project includes
- Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$' - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$'
Priority: 1 Priority: 1
# Third party library includes # Third party library includes
- Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>' - Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>'
Priority: 3 Priority: 3
# Qt includes # Qt includes
- Regex: '^<Q[a-zA-Z0-9\._\/-]+>$' - Regex: '^<Q[a-zA-Z0-9\._\/-]+>$'
Priority: 3 Priority: 3
CaseSensitive: true CaseSensitive: true
# LibCommuni includes # LibCommuni includes
- Regex: '^<Irc[a-zA-Z]+>$' - Regex: "^<Irc[a-zA-Z]+>$"
Priority: 3 Priority: 3
# Misc libraries # Misc libraries
- Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$' - Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$'
Priority: 3 Priority: 3
# Standard library includes # Standard library includes
- Regex: '^<[a-zA-Z_]+>$' - Regex: "^<[a-zA-Z_]+>$"
Priority: 4 Priority: 4
NamespaceIndentation: Inner NamespaceIndentation: Inner
PointerBindsToType: false PointerBindsToType: false

View file

@ -9,14 +9,13 @@ AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakBeforeMultilineStrings: false AlwaysBreakBeforeMultilineStrings: false
BasedOnStyle: Google BasedOnStyle: Google
BraceWrapping: { BraceWrapping:
AfterClass: 'true' AfterClass: "true"
AfterControlStatement: 'true' AfterControlStatement: "true"
AfterFunction: 'true' AfterFunction: "true"
AfterNamespace: 'false' AfterNamespace: "false"
BeforeCatch: 'true' BeforeCatch: "true"
BeforeElse: 'true' BeforeElse: "true"
}
BreakBeforeBraces: Custom BreakBeforeBraces: Custom
BreakConstructorInitializersBeforeComma: true BreakConstructorInitializersBeforeComma: true
ColumnLimit: 80 ColumnLimit: 80
@ -30,24 +29,24 @@ IndentPPDirectives: AfterHash
SortIncludes: CaseInsensitive SortIncludes: CaseInsensitive
IncludeBlocks: Regroup IncludeBlocks: Regroup
IncludeCategories: IncludeCategories:
# Project includes # Project includes
- Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$' - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$'
Priority: 1 Priority: 1
# Third party library includes # Third party library includes
- Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>' - Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>'
Priority: 3 Priority: 3
# Qt includes # Qt includes
- Regex: '^<Q[a-zA-Z0-9\._\/-]+>$' - Regex: '^<Q[a-zA-Z0-9\._\/-]+>$'
Priority: 3 Priority: 3
CaseSensitive: true CaseSensitive: true
# LibCommuni includes # LibCommuni includes
- Regex: '^<Irc[a-zA-Z]+>$' - Regex: "^<Irc[a-zA-Z]+>$"
Priority: 3 Priority: 3
# Misc libraries # Misc libraries
- Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$' - Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$'
Priority: 3 Priority: 3
# Standard library includes # Standard library includes
- Regex: '^<[a-zA-Z_]+>$' - Regex: "^<[a-zA-Z_]+>$"
Priority: 4 Priority: 4
NamespaceIndentation: Inner NamespaceIndentation: Inner
PointerBindsToType: false PointerBindsToType: false