Skip to content

Migrate all VS 2022 solutions to slnx #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
walbourn wants to merge 1 commit into
base: main
Choose a base branch
from
+129 −64
Open

Migrate all VS 2022 solutions to slnx #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 52 additions & 11 deletions .github/workflows/msbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,14 @@ jobs:
fail-fast: false

matrix:
vs: [2019, 2022]
build_type: [Debug, Release, 'NI Debug', 'NI Release']
platform: [x86, x64, ARM64]
exclude:
- vs: 2019
platform: ARM64

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Clone test repository
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
repository: walbourn/directxmathtest
path: Tests
Expand All @@ -62,21 +58,66 @@ jobs:
working-directory: ${{ github.workspace }}/Tests/math3
run: >
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
./math3_${{ matrix.vs }}.sln
./math3_2022.slnx

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build shmath
working-directory: ${{ github.workspace }}/Tests/shmath
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./shmath_${{ matrix.vs }}.sln
./shmath_2022.slnx

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build xdsp
working-directory: ${{ github.workspace }}/Tests/xdsp
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./XDSPTest_${{ matrix.vs }}.sln
./XDSPTest_2022.slnx

build2019:
runs-on: windows-2022

strategy:
fail-fast: false

matrix:
build_type: [Debug, Release, 'NI Debug', 'NI Release']
platform: [x86, x64]

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Clone test repository
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
repository: walbourn/directxmathtest
path: Tests
ref: main

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
with:
msbuild-architecture: x64

- name: Build math3
working-directory: ${{ github.workspace }}/Tests/math3
run: >
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
./math3_2019.sln

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build shmath
working-directory: ${{ github.workspace }}/Tests/shmath
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./shmath_2019.sln

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build xdsp
working-directory: ${{ github.workspace }}/Tests/xdsp
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./XDSPTest_2019.sln

build2022_arm64:
runs-on: windows-11-arm
Expand All @@ -88,10 +129,10 @@ jobs:
build_type: [Debug, Release, 'NI Debug', 'NI Release']

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Clone test repository
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
repository: walbourn/directxmathtest
path: Tests
Expand Down
130 changes: 77 additions & 53 deletions .github/workflows/msbuildex.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,72 +37,96 @@ jobs:

matrix:
include:
- vs: 2019
platform: x86
- platform: x86
build_type: 'AVX Debug'
- vs: 2019
platform: x64
- platform: x64
build_type: 'AVX Debug'
- vs: 2022
platform: x86
build_type: 'AVX Debug'
- vs: 2022
platform: x64
build_type: 'AVX Debug'
- vs: 2019
platform: x86
build_type: 'AVX2 Debug'
- vs: 2019
platform: x64
build_type: 'AVX2 Debug'
- vs: 2022
platform: x86
- platform: x86
build_type: 'AVX2 Debug'
- vs: 2022
platform: x64
- platform: x64
build_type: 'AVX2 Debug'
- vs: 2019
platform: x86
- platform: x86
build_type: 'x87 Debug'
- vs: 2022
platform: x86
build_type: 'x87 Debug'
- vs: 2019
platform: x86
build_type: 'AVX Release'
- vs: 2019
platform: x64
build_type: 'AVX Release'
- vs: 2022
platform: x86
- platform: x86
build_type: 'AVX Release'
- vs: 2022
platform: x64
- platform: x64
build_type: 'AVX Release'
- vs: 2019
platform: x86
- platform: x86
build_type: 'AVX2 Release'
- vs: 2019
platform: x64
- platform: x64
build_type: 'AVX2 Release'
- vs: 2022
platform: x86
- platform: x86
build_type: 'x87 Release'

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Clone test repository
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
repository: walbourn/directxmathtest
path: Tests
ref: main

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
with:
msbuild-architecture: x64

- name: Build math3
working-directory: ${{ github.workspace }}/Tests/math3
run: >
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
./math3_2022.slnx

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build shmath
working-directory: ${{ github.workspace }}/Tests/shmath
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./shmath_2022.slnx

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build xdsp
working-directory: ${{ github.workspace }}/Tests/xdsp
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./XDSPTest_2022.slnx

build2019:
runs-on: windows-2022

strategy:
fail-fast: false

matrix:
include:
- platform: x86
build_type: 'AVX Debug'
- platform: x64
build_type: 'AVX Debug'
- platform: x86
build_type: 'AVX2 Debug'
- platform: x64
build_type: 'AVX2 Debug'
- platform: x86
build_type: 'x87 Debug'
- platform: x86
build_type: 'AVX Release'
- platform: x64
build_type: 'AVX Release'
- platform: x86
build_type: 'AVX2 Release'
- vs: 2022
platform: x64
- platform: x64
build_type: 'AVX2 Release'
- vs: 2019
platform: x86
build_type: 'x87 Release'
- vs: 2022
platform: x86
- platform: x86
build_type: 'x87 Release'

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Clone test repository
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
repository: walbourn/directxmathtest
path: Tests
Expand All @@ -117,18 +141,18 @@ jobs:
working-directory: ${{ github.workspace }}/Tests/math3
run: >
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
./math3_${{ matrix.vs }}.sln
./math3_2019.sln

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build shmath
working-directory: ${{ github.workspace }}/Tests/shmath
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./shmath_${{ matrix.vs }}.sln
./shmath_2019.sln

- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
name: Build xdsp
working-directory: ${{ github.workspace }}/Tests/xdsp
run: >
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
./XDSPTest_${{ matrix.vs }}.sln
./XDSPTest_2019.sln
Loading