Skip to content

Commit 0ffb510

Browse files
authored
Merge pull request #6980 from rhuanjl/linux22
Enable Ubuntu 22 CI
2 parents 2af598f + e42466f commit 0ffb510

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

azure-pipelines.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#-------------------------------------------------------------------------------------------------------
2-
# Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
2+
# Copyright (c) ChakraCore Project Contributors. All rights reserved.
33
# Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
44
#-------------------------------------------------------------------------------------------------------
55

@@ -32,17 +32,32 @@ jobs:
3232
strategy:
3333
maxParallel: 6
3434
matrix:
35+
Linux.Debug:
36+
image_name: 'ubuntu-22.04'
37+
deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
38+
build_type: 'Debug'
39+
libtype_flag: ''
3540
Linux.NoJit:
36-
image_name: 'ubuntu-20.04'
41+
image_name: 'ubuntu-22.04'
3742
deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
3843
build_type: 'Debug'
3944
libtype_flag: '-DDISABLE_JIT=ON'
4045
Linux.ReleaseWithDebug:
41-
image_name: 'ubuntu-20.04'
46+
image_name: 'ubuntu-22.04'
4247
deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
4348
build_type: 'RelWithDebInfo'
4449
libtype_flag: ''
4550
Linux.Release:
51+
image_name: 'ubuntu-22.04'
52+
deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
53+
build_type: 'Release'
54+
libtype_flag: ''
55+
Ubuntu20.ReleaseWithDebug:
56+
image_name: 'ubuntu-20.04'
57+
deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
58+
build_type: 'RelWithDebInfo'
59+
libtype_flag: ''
60+
Ubuntu20.Release:
4661
image_name: 'ubuntu-20.04'
4762
deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
4863
build_type: 'Release'

test/runtests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#-------------------------------------------------------------------------------------------------------
33
# Copyright (C) Microsoft. All rights reserved.
4-
# Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
4+
# Copyright (c) ChakraCore Project Contributors. All rights reserved.
55
# Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
66
#-------------------------------------------------------------------------------------------------------
77

@@ -316,11 +316,11 @@ def __init__(self, name, compile_flags=[], variant_not_tags=[]):
316316

317317
@staticmethod
318318
def _has_expansion(flags):
319-
return any(re.match('.*\${.*}', f) for f in flags)
319+
return any(re.match(r'.*\${.*}', f) for f in flags)
320320

321321
@staticmethod
322322
def _expand(flag, test):
323-
return re.sub('\${id}', str(test.id), flag)
323+
return re.sub(r'\${id}', str(test.id), flag)
324324

325325
def _expand_compile_flags(self, test):
326326
if self._compile_flags_has_expansion:

0 commit comments

Comments
 (0)