diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 77a43cb..f55f6f1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,16 +72,11 @@ jobs: $DownloadFolder = ./example/Scripts/installFASTBuild.ps1 echo $DownloadFolder >> $env:GITHUB_PATH - - name: CMake Configure ${{ matrix.buildPreset }} + - name: Build - ${{ matrix.buildPreset }}, ${{ matrix.configuration }} shell: pwsh run: | Set-Location ./example - cmake --preset ${{ matrix.buildPreset }} - - name: CMake Build ${{ matrix.buildPreset }} - shell: pwsh - run: | - Set-Location ./example - cmake --build --preset ${{ matrix.buildPreset }} --config ${{ matrix.configuration }} + ./build.ps1 -Preset ${{ matrix.buildPreset }} -Configuration ${{ matrix.configuration }} - name: Upload output artifact uses: actions/upload-artifact@v6 if: ${{ always() }} diff --git a/example/build.ps1 b/example/build.ps1 index 32f73c0..a43e04e 100644 --- a/example/build.ps1 +++ b/example/build.ps1 @@ -5,8 +5,14 @@ [CmdletBinding()] param ( - [ValidateSet('windows-clang-x64', 'windows-msvc-arm64', 'windows-msvc-x64', 'windows-msvc-x86')] - $Presets = @('windows-clang-x64', 'windows-msvc-arm64', 'windows-msvc-x64', 'windows-msvc-x86') + [ValidateSet('windows-ninja-msvc-x64', 'windows-ninja-msvc-x64-spectre', 'windows-ninja-msvc-x86', + 'windows-ninja-msvc-arm64', 'windows-ninja-msvc-host', 'windows-ninja-clang-x64', + 'windows-ninja-clangcl-x64', 'windows-fastbuild-msvc-x64', 'windows-vs2022-x64', + 'windows-vs2022-arm64')] + $Presets = @('windows-ninja-msvc-host'), + + [ValidateSet('Debug', 'Release', 'RelWithDebInfo')] + $Configurations = @('Debug') ) Set-StrictMode -Version Latest @@ -33,12 +39,6 @@ if (-not $CMake) { } } -$Configurations = @( - 'Debug' - 'Release' - 'RelWithDebInfo' -) - foreach ($Preset in $Presets) { & $CMake --preset $Preset