diff --git a/.github/workflows/msvc17.yml b/.github/workflows/msvc17.yml index d0bd2d5..4b2dfb1 100644 --- a/.github/workflows/msvc17.yml +++ b/.github/workflows/msvc17.yml @@ -4,6 +4,22 @@ name: msvc17 on: push jobs: + + msvc-clangcl-latest: + name: MSVC ClangCL Latest + runs-on: windows-2022 + steps: + - uses: actions/checkout@v4 + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.29.0" + - uses: lukka/run-vcpkg@v11 + - uses: lukka/run-cmake@v10 + with: + configurePreset: "cml-ci-ninja-msvc-clangcl-mt-s" + buildPreset: "cml-ci-ninja-msvc-clangcl-mt-s-release" + testPreset: "cml-ci-ninja-msvc-clangcl-mt-s-release-test" + # msvc-latest: # name: MSVC Latest # runs-on: windows-2022 @@ -19,31 +35,31 @@ jobs: # buildPreset: "cml-ci-ninja-msvc-mt-s-release" # testPreset: "cml-ci-ninja-msvc-mt-s-release-test" - msvc-17-10: - name: MSVC 17.10 - runs-on: windows-2022 - steps: - - name: Install MSVC 17.10 - shell: pwsh - run: | - $vspath = 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' - Test-Path -Path $vspath | Should -Be $true + # msvc-17-10: + # name: MSVC 17.10 + # runs-on: windows-2022 + # steps: + # - name: Install MSVC 17.10 + # shell: pwsh + # run: | + # $vspath = 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' + # Test-Path -Path $vspath | Should -Be $true - $vsinstaller = 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe' - Test-Path -Path $vsinstaller | Should -Be $true + # $vsinstaller = 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe' + # Test-Path -Path $vsinstaller | Should -Be $true - Start-Process -NoNewWindow -Wait -FilePath $vsinstaller -ArgumentList ` - 'modify', '--installPath', "`"$vspath`"", '--quiet', '--norestart', '--nocache', '--noUpdateInstaller', ` - '--add', 'Microsoft.VisualStudio.Component.VC.14.40.17.10.x86.x64' + # Start-Process -NoNewWindow -Wait -FilePath $vsinstaller -ArgumentList ` + # 'modify', '--installPath', "`"$vspath`"", '--quiet', '--norestart', '--nocache', '--noUpdateInstaller', ` + # '--add', 'Microsoft.VisualStudio.Component.VC.14.40.17.10.x86.x64' - - uses: actions/checkout@v4 - - uses: lukka/get-cmake@latest - with: - cmakeVersion: "~3.29.0" - - uses: lukka/run-vcpkg@v11 - - uses: lukka/run-cmake@v10 - with: - configurePreset: "cml-ci-msvc17-mt-s" - configurePresetAdditionalArgs: "['-T version=14.40']" - buildPreset: "cml-ci-msvc17-mt-s-release" - testPreset: "cml-ci-msvc17-mt-s-release-test" \ No newline at end of file + # - uses: actions/checkout@v4 + # - uses: lukka/get-cmake@latest + # with: + # cmakeVersion: "~3.29.0" + # - uses: lukka/run-vcpkg@v11 + # - uses: lukka/run-cmake@v10 + # with: + # configurePreset: "cml-ci-msvc17-mt-s" + # configurePresetAdditionalArgs: "['-T version=14.40']" + # buildPreset: "cml-ci-msvc17-mt-s-release" + # testPreset: "cml-ci-msvc17-mt-s-release-test" \ No newline at end of file