diff --git a/src/.gitignore b/src/.gitignore index 243192c08..a65880d3c 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -23,7 +23,6 @@ util/bot/llvm-build util/bot/nasm-win32.exe util/bot/ninja util/bot/perl-win32 -util/bot/perl-win32.zip util/bot/sde-linux64 util/bot/sde-linux64.tar.xz util/bot/sde-win32 diff --git a/src/util/bot/DEPS b/src/util/bot/DEPS index 0bcd2aa9b..6846d3779 100644 --- a/src/util/bot/DEPS +++ b/src/util/bot/DEPS @@ -28,6 +28,8 @@ vars = { 'cmake_version': 'version:2@3.25.2.chromium.6', # infra/3pp/tools/go/linux-amd64 'go_version': 'version:2@1.20', + # infra/3pp/tools/perl/windows-amd64 + 'perl_version': 'version:2@5.32.1.1', # Update the following from # https://chromium.googlesource.com/chromium/src/+/main/DEPS @@ -93,6 +95,15 @@ deps = { 'dep_type': 'cipd', }, + 'boringssl/util/bot/perl-win32': { + 'packages': [{ + 'package': 'infra/3pp/tools/perl/${{platform}}', + 'version': Var('perl_version'), + }], + 'condition': 'host_os == "win"', + 'dep_type': 'cipd', + }, + 'boringssl/util/bot/libFuzzer': { 'url': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' +'@' + Var('libfuzzer_revision'), 'condition': 'checkout_fuzzer', @@ -122,29 +133,6 @@ recursedeps = [ ] hooks = [ - { - 'name': 'perl_win32', - 'pattern': '.', - 'condition': 'host_os == "win"', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--platform=win32', - '--no_auth', - '--bucket', 'chromium-tools', - '-s', 'boringssl/util/bot/perl-win32.zip.sha1', - ], - }, - { - 'name': 'perl_win32_extract', - 'pattern': '.', - 'condition': 'host_os == "win"', - 'action': [ 'python3', - 'boringssl/util/bot/extract.py', - '--no-prefix', - 'boringssl/util/bot/perl-win32.zip', - 'boringssl/util/bot/perl-win32/', - ], - }, { 'name': 'nasm_win32', 'pattern': '.', diff --git a/src/util/bot/UPDATING b/src/util/bot/UPDATING index 8eaa1cfa8..bbe27c754 100644 --- a/src/util/bot/UPDATING +++ b/src/util/bot/UPDATING @@ -31,12 +31,6 @@ nasm-win32.exe: Update to the appropriate release of NASM, found at The current revision is nasm-2.13.03-win64.zip. -perl-win32.zip: Update to the latest 64-bit prebuilt "Portable" edition of - Strawberry Perl, found at http://strawberryperl.com/releases.html. The - download will be named strawberry-perl-VERSION-64bit-portable.zip. - - The current revision is strawberry-perl-5.26.2.1-64bit-portable.zip. - Finally, update sde-linux64.tar.xz and sde-win32.tar.xz by downloading the latet release from Intel at https://software.intel.com/en-us/articles/intel-software-development-emulator, diff --git a/src/util/bot/perl-win32.zip.sha1 b/src/util/bot/perl-win32.zip.sha1 deleted file mode 100644 index ac0c3f00d..000000000 --- a/src/util/bot/perl-win32.zip.sha1 +++ /dev/null @@ -1 +0,0 @@ -10a112b4d5f4efbbba4e45ccbe1fa50943e106c6 \ No newline at end of file