From 88e057c902d6a6a530c3750348db481c15fdec3f Mon Sep 17 00:00:00 2001 From: rhuanjl Date: Tue, 16 Apr 2024 21:40:42 +0100 Subject: [PATCH 1/2] Ubuntu 22 to CI --- azure-pipelines.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 22fccb4312e..85712522c8a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------------------------------- -# Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved. +# Copyright (c) ChakraCore Project Contributors. All rights reserved. # Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. #------------------------------------------------------------------------------------------------------- @@ -32,17 +32,32 @@ jobs: strategy: maxParallel: 6 matrix: + Linux.Debug: + image_name: 'ubuntu-22.04' + deps: 'sudo apt-get install -y ninja-build clang libicu-dev' + build_type: 'Debug' + libtype_flag: '' Linux.NoJit: - image_name: 'ubuntu-20.04' + image_name: 'ubuntu-22.04' deps: 'sudo apt-get install -y ninja-build clang libicu-dev' build_type: 'Debug' libtype_flag: '-DDISABLE_JIT=ON' Linux.ReleaseWithDebug: - image_name: 'ubuntu-20.04' + image_name: 'ubuntu-22.04' deps: 'sudo apt-get install -y ninja-build clang libicu-dev' build_type: 'RelWithDebInfo' libtype_flag: '' Linux.Release: + image_name: 'ubuntu-22.04' + deps: 'sudo apt-get install -y ninja-build clang libicu-dev' + build_type: 'Release' + libtype_flag: '' + Ubuntu20.ReleaseWithDebug: + image_name: 'ubuntu-20.04' + deps: 'sudo apt-get install -y ninja-build clang libicu-dev' + build_type: 'RelWithDebInfo' + libtype_flag: '' + Ubuntu20.Release: image_name: 'ubuntu-20.04' deps: 'sudo apt-get install -y ninja-build clang libicu-dev' build_type: 'Release' From e42466fe56f805819fd7890856dd1400756efd25 Mon Sep 17 00:00:00 2001 From: rhuanjl Date: Tue, 16 Apr 2024 21:40:55 +0100 Subject: [PATCH 2/2] fix Python3.3 syntax error --- test/runtests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/runtests.py b/test/runtests.py index f1c918639e8..d6ae6c532ee 100755 --- a/test/runtests.py +++ b/test/runtests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #------------------------------------------------------------------------------------------------------- # Copyright (C) Microsoft. All rights reserved. -# Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved. +# Copyright (c) ChakraCore Project Contributors. All rights reserved. # Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. #------------------------------------------------------------------------------------------------------- @@ -316,11 +316,11 @@ def __init__(self, name, compile_flags=[], variant_not_tags=[]): @staticmethod def _has_expansion(flags): - return any(re.match('.*\${.*}', f) for f in flags) + return any(re.match(r'.*\${.*}', f) for f in flags) @staticmethod def _expand(flag, test): - return re.sub('\${id}', str(test.id), flag) + return re.sub(r'\${id}', str(test.id), flag) def _expand_compile_flags(self, test): if self._compile_flags_has_expansion: