diff options
| author | David Benjamin <davidben@google.com> | 2024-03-21 10:49:11 +1000 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-03-29 01:24:27 +0000 |
| commit | d39bd7557615dba34de87c07711ca4ed40c2b194 (patch) | |
| tree | 1f36f87d9774f1475d92f30188681bc9904202c1 /util | |
| parent | 54c956b2e668e11c75f1ee0367f1b3a0ad28eff9 (diff) | |
| download | boringssl-d39bd7557615dba34de87c07711ca4ed40c2b194.zip boringssl-d39bd7557615dba34de87c07711ca4ed40c2b194.tar.gz boringssl-d39bd7557615dba34de87c07711ca4ed40c2b194.tar.bz2 | |
Update CI build tools
Change-Id: I569110a8648f0504897b9ea94b115cd038149ace
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/67327
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/bot/DEPS | 8 | ||||
| -rw-r--r-- | util/bot/libcxx-config/__assertion_handler | 9 | ||||
| -rw-r--r-- | util/bot/update_clang.py | 4 | ||||
| -rw-r--r-- | util/bot/vs_toolchain.py | 5 |
4 files changed, 18 insertions, 8 deletions
diff --git a/util/bot/DEPS b/util/bot/DEPS index 9f004bc..b060ca4 100644 --- a/util/bot/DEPS +++ b/util/bot/DEPS @@ -26,9 +26,9 @@ vars = { # cipd describe PACKAGE_NAME -version latest # infra/3pp/tools/cmake/linux-amd64 - 'cmake_version': 'version:2@3.28.1.chromium.8', + 'cmake_version': 'version:2@3.28.4.chromium.8', # infra/3pp/tools/go/linux-amd64 - 'go_version': 'version:2@1.21.5', + 'go_version': 'version:2@1.22.1', # infra/3pp/tools/perl/windows-amd64 'perl_version': 'version:2@5.32.1.1', @@ -36,8 +36,8 @@ vars = { # https://chromium.googlesource.com/chromium/src/+/main/DEPS 'android_sdk_platform-tools_version': 'HWVsGs2HCKgSVv41FsOcsfJbNcB0UFiNrF6Tc4yRArYC', 'libfuzzer_revision': '758bd21f103a501b362b1ca46fa8fcb692eaa303', - 'libcxx_revision': 'd0429f0628dd5c2c83a197012b2153b979aff674', - 'libcxxabi_revision': '8806fb8bb26e20206241ea2dfcee4fd2d4157b83', + 'libcxx_revision': '80307e66e74bae927fb8709a549859e777e3bf0b', + 'libcxxabi_revision': 'ec88f0ab262c5f2426dbf138b92ee9ae5961e431', 'ninja_version': 'version:2@1.11.1.chromium.6', # The Android NDK cannot be updated on CI for two reasons: diff --git a/util/bot/libcxx-config/__assertion_handler b/util/bot/libcxx-config/__assertion_handler new file mode 100644 index 0000000..22de65e --- /dev/null +++ b/util/bot/libcxx-config/__assertion_handler @@ -0,0 +1,9 @@ +#ifndef BORINGSSL_LIBCXX_ASSERTION_HANDLER_ +#define BORINGSSL_LIBCXX_ASSERTION_HANDLER_ + +#include <__verbose_abort> + +// We use only bundle libc++ for testing, so we can use the verbose aborts. +#define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message) + +#endif // BORINGSSL_LIBCXX_ASSERTION_HANDLER_ diff --git a/util/bot/update_clang.py b/util/bot/update_clang.py index b47c008..b876921 100644 --- a/util/bot/update_clang.py +++ b/util/bot/update_clang.py @@ -29,8 +29,8 @@ except ImportError: # CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang # to use. These should be synced with tools/clang/scripts/update.py in # Chromium. -CLANG_REVISION = 'llvmorg-18-init-14420-gea3a3b25' -CLANG_SUB_REVISION = 3 +CLANG_REVISION = 'llvmorg-19-init-2941-ga0b3dbaf' +CLANG_SUB_REVISION = 22 PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION) diff --git a/util/bot/vs_toolchain.py b/util/bot/vs_toolchain.py index 9e19e22..d287ee2 100644 --- a/util/bot/vs_toolchain.py +++ b/util/bot/vs_toolchain.py @@ -72,8 +72,9 @@ def _GetDesiredVsToolchainHashes(version): # with ARM64 libraries and UWP support. return ['0b5ee4d2b1'] if version == '2022': - # VS 2022 17.4 with 10.0.22621.0 SDK with ARM64 libraries and UWP support. - return ['27370823e7'] + # VS 2022 17.9.2 with 10.0.22621.2428 SDK with ARM64 libraries and UWP + # support. + return ['7393122652'] raise Exception('Unsupported VS version %s' % version) |