Skip to content

Commit ebf0498

Browse files
Update compiler support (#1021)
Bump clang and Xcode supported versions and add support for VS with LLVM
1 parent c412deb commit ebf0498

File tree

3 files changed

+25
-26
lines changed

3 files changed

+25
-26
lines changed

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,17 @@ Below is a table showing the versions currently being tested.
9393

9494
Compiler |Toolset Versions Currently Tested
9595
:------- |--:
96-
XCode | 13.1 & 12.5.1
97-
GCC | 11.1.0 & 10.3.0
98-
Clang | 11.0.0 & 10.0.0
99-
Visual Studio with MSVC | VS2019 (16.11) & VS2022 (17.0)
100-
Visual Studio with LLVM | VS2019 (16.11)
96+
XCode | 13.2.1 & 12.5.1
97+
GCC | 11[^1] & 10[^2]
98+
Clang | 12[^2] & 11[^2]
99+
Visual Studio with MSVC | VS2022[^3] & VS2019[^4]
100+
Visual Studio with LLVM | VS2022[^3] & VS2019[^4]
101101

102-
- Support for Visual Studio 2022 with LLVM will be added in the near future
102+
103+
[^1]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26).
104+
[^2]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26). Should be the version specified [here](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md#language-and-runtime).
105+
[^3]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26). Should be the version specified [here](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md#visual-studio-enterprise-2022).
106+
[^4]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26). Should be the version specified [here](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#visual-studio-enterprise-2019).
103107

104108
---
105109
If you successfully port GSL to another platform, we would love to hear from you!

azure-pipelines.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ stages:
2222
parameters:
2323
compiler: clang
2424
image: ubuntu-20.04
25-
compilerVersions: [ 11, 10 ]
25+
compilerVersions: [ 12, 11 ]
2626
setupfile: 'setup_clang.yml'
2727

2828
- stage: Xcode
@@ -32,40 +32,35 @@ stages:
3232
parameters:
3333
compiler: 'Xcode'
3434
image: macOS-11
35-
compilerVersions: [ '12.5.1', '13.1' ]
35+
compilerVersions: [ '12.5.1', '13.2.1' ]
3636
setupfile: 'setup_apple.yml'
3737

3838
- stage: VS_MSVC
3939
dependsOn: []
4040
jobs:
4141
- template: ./pipelines/jobs.yml
4242
parameters:
43-
compiler: 'VS2019 (16.11)'
44-
compilerVersions: [ 'MSVC' ]
43+
compiler: 'VS2019 (MSVC)'
44+
compilerVersions: [ 'default' ]
4545
image: windows-2019
4646
- template: ./pipelines/jobs.yml
4747
parameters:
48-
compiler: 'VS2022 (17.0)'
49-
compilerVersions: [ 'MSVC' ]
48+
compiler: 'VS2022 (MSVC)'
49+
compilerVersions: [ 'default' ]
5050
image: windows-2022
5151

5252
- stage: VS_LLVM
5353
dependsOn: []
5454
jobs:
5555
- template: ./pipelines/jobs.yml
5656
parameters:
57-
compiler: 'VS2019 (16.11)'
58-
compilerVersions: [ 'LLVM' ]
57+
compiler: 'VS2019 (LLVM)'
58+
compilerVersions: [ 'default' ]
5959
image: windows-2019
6060
extraCmakeArgs: '-T ClangCL'
61-
62-
# The *same* config as with 2019 but on 2022 yields an error.
63-
# Tracking issue: https://github.com/actions/virtual-environments/issues/4716
64-
# - template: ./pipelines/jobs.yml
65-
# parameters:
66-
# compiler: 'VS2022 LLVM'
67-
# compilerVersions: [ '17.0' ]
68-
# image: windows-2022
69-
# extraCmakeArgs: '-T ClangCL'
70-
# CXXVersions: [ 14 ]
71-
# buildTypes: [ Release ]
61+
- template: ./pipelines/jobs.yml
62+
parameters:
63+
compiler: 'VS2022 (LLVM)'
64+
compilerVersions: [ 'default' ]
65+
image: windows-2022
66+
extraCmakeArgs: '-T ClangCL'

pipelines/setup_apple.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33

44
steps:
55
- script: |
6-
if [ "${{ parameters.version }}" = "12.5.1" ]; then sudo xcode-select -switch /Applications/Xcode_12.5.1.app; fi
6+
if [ "${{ parameters.version }}" != "default" ]; then sudo xcode-select -switch /Applications/Xcode_${{ parameters.version }}.app; fi
77
88
displayName: "Setup Xcode Version"
99
failOnStderr: true

0 commit comments

Comments
 (0)