From e3729eb8041941c971008302ce3d79a32d3b1416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 9 Apr 2024 20:15:49 +0200 Subject: [PATCH] Make Silk.NET buildable on Linux by skipping iOS and Mac Catalyst stuff. (#2017) --- .github/workflows/bindings-regeneration.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/public-api.yml | 2 +- README.md | 18 ++++++++++-------- .../TriangleNET6/TriangleNET6.csproj | 3 ++- src/Maths/Silk.NET.Maths/Silk.NET.Maths.csproj | 3 ++- .../Silk.NET.Vulkan/Silk.NET.Vulkan.csproj | 3 ++- .../Silk.NET.Windowing.Sdl.csproj | 5 +++-- .../Silk.NET.Windowing.csproj | 5 +++-- 9 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/bindings-regeneration.yml b/.github/workflows/bindings-regeneration.yml index ca83614783..37d19b63d9 100644 --- a/.github/workflows/bindings-regeneration.yml +++ b/.github/workflows/bindings-regeneration.yml @@ -48,7 +48,7 @@ jobs: run: dotnet tool install Nuke.GlobalTool --global - name: Install Workloads # TODO: This is slow. Maybe we can make a docker container with this already done? - run: dotnet workload install android ios maccatalyst maui + run: dotnet workload install android ios maccatalyst - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.9 name: Setup Windows 11 SDK with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79b0726470..d909a5d11c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: with: dotnet-version: 7.0.102 - name: Install Workloads - run: dotnet workload install android ios maccatalyst maui + run: dotnet workload install android ios maccatalyst - name: Test if: ${{ github.repository != 'dotnet/Silk.NET' || !startsWith(github.ref, 'refs/tags/') }} # skip Clean, Restore, and Compile as this will build the affect the whole solution. diff --git a/.github/workflows/public-api.yml b/.github/workflows/public-api.yml index ae2bcd3678..7cd0aec02c 100644 --- a/.github/workflows/public-api.yml +++ b/.github/workflows/public-api.yml @@ -42,7 +42,7 @@ jobs: 7.0.* - name: Install Workloads for Restore # TODO: This is slow. Maybe we can make a docker container with this already done? - run: dotnet workload install android ios maccatalyst maui + run: dotnet workload install android ios maccatalyst - name: Ensure Public API Declared run: ./build.sh EnsureApiDeclared env: diff --git a/README.md b/README.md index c6d8f9e670..43093dcccc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ -
+