Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
protyposis committed Dec 7, 2023
2 parents 3ac8920 + 1b4f582 commit 741ff77
Show file tree
Hide file tree
Showing 551 changed files with 21,526 additions and 42,664 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.26.4",
"commands": [
"dotnet-csharpier"
]
}
}
}
72 changes: 72 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: CI

on:
push:
branches: [ "main", "develop" ]
pull_request:
branches: [ "main", "develop" ]

env:
dotnet_version: 6.0.x

jobs:
code:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.dotnet_version }}
- name: Restore tools
run: dotnet tool restore
- name: Code format
run: dotnet csharpier --check src

linux:
runs-on: ubuntu-latest
needs: code
steps:
- name: Install build tools
run: sudo apt-get install -y cmake ninja-build
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.dotnet_version }}
- name: Install local deps
run: |
chmod +x ./install-deps.sh
./install-deps.sh
- name: Setup native project
run: cmake nativesrc --preset linux-debug
- name: Build native code
run: cmake --build nativesrc/out/build/linux-debug
- name: Build
run: dotnet build src -c LinuxDebug
- name: Test
run: dotnet test src --no-build --verbosity normal -c LinuxDebug

windows:
runs-on: windows-latest
needs: code
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.dotnet_version }}
- uses: ilammy/msvc-dev-cmd@v1
- name: Build
shell: pwsh
run: .\install-deps.ps1
- name: Setup native project
run: cmake nativesrc --preset x64-debug
- name: Build native code
run: cmake --build nativesrc\out\build\x64-debug
- name: Restore dependencies
run: dotnet restore src
- name: Build
run: dotnet build src --no-restore -c Debug
- name: Test
run: dotnet test src --no-build --verbosity normal -c Debug
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ obj/
*.sdf
*.opensdf
.vs
*.vcxproj.user
*.DotSettings.user
*.VC.db
.idea/

# NuGet
**/packages/*

licenseinfo.txt
/dist
README.nuget.md
17 changes: 0 additions & 17 deletions Aurio/Aurio.Exocortex/Aurio.Exocortex.csproj

This file was deleted.

42 changes: 0 additions & 42 deletions Aurio/Aurio.FFTW/Interop32Wrapper.cs

This file was deleted.

74 changes: 0 additions & 74 deletions Aurio/Aurio.FFTW/Interop64.cs

This file was deleted.

120 changes: 0 additions & 120 deletions Aurio/Aurio.FFmpeg.Proxy32/Aurio.FFmpeg.Proxy32.vcxproj

This file was deleted.

36 changes: 0 additions & 36 deletions Aurio/Aurio.FFmpeg.Proxy32/Aurio.FFmpeg.Proxy32.vcxproj.filters

This file was deleted.

Loading

0 comments on commit 741ff77

Please sign in to comment.