Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ThirdEyeSqueegee committed May 14, 2024
1 parent 48c8143 commit 7558976
Show file tree
Hide file tree
Showing 30 changed files with 383 additions and 18,025 deletions.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ AlignOperands: Align
AlignTrailingComments:
Kind: Always
OverEmptyLines: 0
AllowShortCompoundRequirementOnASingleLine: true
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowBreakBeforeNoexceptSpecifier: OnlyWithParen
AlwaysBreakTemplateDeclarations: Yes
AttributeMacros:
- __declspec
Expand Down Expand Up @@ -60,6 +62,7 @@ BraceWrapping:
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakAdjacentStringLiterals: false
BreakBeforeBraces: Custom
BreakConstructorInitializers: BeforeColon
ColumnLimit: 180
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/clang-format.yml

This file was deleted.

7 changes: 4 additions & 3 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
- "**.yml"
workflow_dispatch:

permissions: write-all
permissions:
contents: write

jobs:
prettier:
Expand All @@ -20,10 +21,10 @@ jobs:
- name: Run Prettier
uses: actionsx/prettier@v3
with:
args: --write "**.json" "**.yml"
args: --write "${{ github.workspace }}/*.json"

- name: Add & Commit
uses: EndBug/add-and-commit@v9.1.3
uses: EndBug/add-and-commit@v9
with:
message: "ci: formatting"
default_author: github_actions
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/testbuild.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
name: Test Build

on:
workflow_run:
workflows: clang-format
types: completed
push:
branches: main
paths:
- "**.h"
- "**.cpp"
- "**.yml"
workflow_dispatch:

env:
VCPKG_COMMIT_ID: e44d60e6bf0964064bf69667cd9f3e91dc383c7c
VCPKG_COMMIT_ID: 28b1cf627c0570b3e094192df2fce31a3a2bc1d3

jobs:
test-build:
runs-on: windows-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
strategy:
matrix:
preset:
Expand All @@ -26,12 +28,15 @@ jobs:
uses: lukka/get-cmake@latest

- name: Setup vcpkg
uses: lukka/run-vcpkg@v11.1
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}

- name: Initialize submodules
run: git submodule update --init --recursive

- name: Run CMake
uses: lukka/run-cmake@v10.6
uses: lukka/run-cmake@v10
with:
configurePreset: build-${{ matrix.preset }}-msvc
buildPreset: ${{ matrix.preset }}-msvc
Loading

0 comments on commit 7558976

Please sign in to comment.