Skip to content

Commit

Permalink
Reintegrate x86 CI (#9)
Browse files Browse the repository at this point in the history
* Try to reintroduce x86 CI

* Use newer .NET

* Switch test project to .NET 8 as well
  • Loading branch information
Saalvage authored Nov 29, 2024
1 parent 2a3c7ff commit 830653e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ jobs:
strategy:
fail-fast: false
matrix:
name: [Windows x64, Linux, MacOS x64, MacOS ARM64]
name: [Windows x64, Windows x86, Linux, MacOS x64, MacOS ARM64]
configuration: [Release, Debug]
include:
- name: Windows x64
os: windows-latest
# TOOD: setup-dotnet is broken for x86, see https://github.com/actions/setup-dotnet/issues/485
#- name: Windows x86
# os: windows-latest
# additional_args: -a x86
- name: Windows x86
os: windows-latest
additional_args: -a x86
- name: Linux
os: ubuntu-latest
- name: MacOS x64
Expand All @@ -34,7 +33,7 @@ jobs:

- uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.x.x
dotnet-version: 8.x.x

- run: dotnet test AssimpNet.Test -c ${{ matrix.configuration }} ${{ matrix.additional_args }}

Expand Down
2 changes: 1 addition & 1 deletion AssimpNet.Test/AssimpNet.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7</TargetFrameworks>
<TargetFrameworks>net8</TargetFrameworks>
<RootNamespace>Assimp.Test</RootNamespace>
<LangVersion>latest</LangVersion>
<ForceCopyNativeAssimp>true</ForceCopyNativeAssimp>
Expand Down

0 comments on commit 830653e

Please sign in to comment.