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

gh-actions: add windows-2016, ubuntu-20.04 jobs

Browse Source
This commit is contained in:
Ralph Lange
2020-06-16 17:12:08 +02:00
parent 5a0acc2228
commit 074a7ab617
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,11 +22,13 @@ jobs:
CMP: ${{ matrix.cmp }} CMP: ${{ matrix.cmp }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15] os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
cmp: [gcc] cmp: [gcc]
include: include:
- cmp: vs2019 - cmp: vs2019
os: windows-2019 os: windows-2019
- cmp: vs2017
os: windows-2016
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -44,7 +46,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15] os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

5
cue-test.py
View File

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

1
cue.py
View File

@@ -208,6 +208,7 @@ vcvars_table = {
'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',
r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat',
r'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat'], r'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat'],
'vs2015': [r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'], 'vs2015': [r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'],
'vs2013': [r'C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat'], 'vs2013': [r'C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat'],