epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Add vs2022

Browse Source
This commit is contained in:
Michael Davidsaver
2022-01-01 10:51:49 -08:00
parent 93062ba941
commit e065445f76
4 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.appveyor.yml
View File

@@ -72,19 +72,21 @@ environment:
VV: 1 VV: 1
matrix: matrix:
- CMP: vs2019 - CMP: vs2022
SET: test00 SET: test00
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
- CMP: gcc - CMP: gcc
- CMP: vs2019 - CMP: vs2022
VV: 0 VV: 0
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
- CMP: vs2019 - CMP: vs2022
BASE: 3.15 BASE: 3.15
CLEAN_DEPS: NO CLEAN_DEPS: NO
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
- CMP: vs2019 - CMP: vs2022
BASE: 3.14 BASE: 3.14
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
- CMP: vs2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CMP: vs2017 - CMP: vs2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

16
.github/workflows/build-and-test.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15] os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2022, windows-2019, windows-2016, macos-10.15]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Show initial environment - name: Show initial environment
@@ -113,12 +113,22 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [windows-2019, windows-2016] os: [windows-2022, windows-2019, windows-2016]
cmp: [gcc, vs2019, vs2017] cmp: [gcc, vs2022, vs2019, vs2017]
configuration: [default, static, debug, static-debug] configuration: [default, static, debug, static-debug]
exclude: exclude:
- os: windows-2022
cmp: vs2019
- os: windows-2022
cmp: vs2017
- os: windows-2019
cmp: vs2022
- os: windows-2019 - os: windows-2019
cmp: vs2017 cmp: vs2017
- os: windows-2016
cmp: vs2022
- os: windows-2016 - os: windows-2016
cmp: vs2019 cmp: vs2019
steps: steps:

4
cue-test.py
View File

@@ -349,8 +349,10 @@ class TestVCVars(unittest.TestCase):
os.environ['CONFIGURATION'] = 'default' os.environ['CONFIGURATION'] = 'default'
if ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win16': if ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win16':
os.environ['CMP'] = 'vs2017' os.environ['CMP'] = 'vs2017'
else: elif ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win19':
os.environ['CMP'] = 'vs2019' os.environ['CMP'] = 'vs2019'
else:
os.environ['CMP'] = 'vs2022'
cue.detect_context() cue.detect_context()
cue.with_vcvars('env') cue.with_vcvars('env')

2
cue.py
View File

@@ -266,6 +266,8 @@ toolsdir = os.path.join(homedir, '.tools')
vcvars_table = { vcvars_table = {
# https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History # https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History
'vs2022': [r'C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat',
r'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'],
'vs2019': [r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat', 'vs2019': [r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat',
r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'], r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'],
'vs2017': [r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat', 'vs2017': [r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat',