diff --git a/.gitignore b/.gitignore index a8e3184cc..6cbc9d2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ util/bot/nasm-win32.exe util/bot/perl-win32 util/bot/perl-win32.zip util/bot/sde-linux64 -util/bot/sde-linux64.tar.bz2 +util/bot/sde-linux64.tar.xz util/bot/sde-win32 -util/bot/sde-win32.tar.bz2 +util/bot/sde-win32.tar.xz util/bot/win_toolchain.json diff --git a/util/bot/DEPS b/util/bot/DEPS index e3c95f364..574d94bfe 100644 --- a/util/bot/DEPS +++ b/util/bot/DEPS @@ -187,7 +187,7 @@ hooks = [ 'action': [ 'download_from_google_storage', '--no_resume', '--bucket', 'chrome-boringssl-sde', - '-s', 'boringssl/util/bot/sde-linux64.tar.bz2.sha1' + '-s', 'boringssl/util/bot/sde-linux64.tar.xz.sha1' ], }, { @@ -196,7 +196,7 @@ hooks = [ 'condition': 'checkout_sde and host_os == "linux"', 'action': [ 'python3', 'boringssl/util/bot/extract.py', - 'boringssl/util/bot/sde-linux64.tar.bz2', + 'boringssl/util/bot/sde-linux64.tar.xz', 'boringssl/util/bot/sde-linux64/', ], }, @@ -207,7 +207,7 @@ hooks = [ 'action': [ 'download_from_google_storage', '--no_resume', '--bucket', 'chrome-boringssl-sde', - '-s', 'boringssl/util/bot/sde-win32.tar.bz2.sha1' + '-s', 'boringssl/util/bot/sde-win32.tar.xz.sha1' ], }, { @@ -216,7 +216,7 @@ hooks = [ 'condition': 'checkout_sde and host_os == "win"', 'action': [ 'python3', 'boringssl/util/bot/extract.py', - 'boringssl/util/bot/sde-win32.tar.bz2', + 'boringssl/util/bot/sde-win32.tar.xz', 'boringssl/util/bot/sde-win32/', ], }, diff --git a/util/bot/UPDATING b/util/bot/UPDATING index 2e6b91445..dad6192b0 100644 --- a/util/bot/UPDATING +++ b/util/bot/UPDATING @@ -46,13 +46,13 @@ perl-win32.zip: Update to the latest 64-bit prebuilt "Portable" edition of The current revision is strawberry-perl-5.26.2.1-64bit-portable.zip. -Finally, update sde-linux64.tar.bz2 and sde-win32.tar.bz2 by downloading the +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, but upload it with the following command. (Note the bucket is different.) - upload_to_google_storage.py -b chrome-boringssl-sde sde-linux64.tar.bz2 sde-win32.tar.bz2 + upload_to_google_storage.py -b chrome-boringssl-sde sde-linux64.tar.xz sde-win32.tar.xz -The current revision is sde-external-8.50.0-2020-03-26-*.tar.bz2. +The current revision is sde-external-9.0.0-2021-11-07-*.tar.xz. When adding new files, remember to update .gitignore. diff --git a/util/bot/extract.py b/util/bot/extract.py index 9b1b88a22..4ef5f6517 100644 --- a/util/bot/extract.py +++ b/util/bot/extract.py @@ -118,6 +118,8 @@ def main(args): entries = IterateTar(archive, 'gz') elif archive.endswith('.tar.bz2'): entries = IterateTar(archive, 'bz2') + elif archive.endswith('.tar.xz'): + entries = IterateTar(archive, 'xz') else: raise ValueError(archive) diff --git a/util/bot/sde-linux64.tar.bz2.sha1 b/util/bot/sde-linux64.tar.bz2.sha1 deleted file mode 100644 index c450f63df..000000000 --- a/util/bot/sde-linux64.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -baacb5a29755e299d3384c41c6dd55f65235ef1f \ No newline at end of file diff --git a/util/bot/sde-linux64.tar.xz.sha1 b/util/bot/sde-linux64.tar.xz.sha1 new file mode 100644 index 000000000..f9ee19835 --- /dev/null +++ b/util/bot/sde-linux64.tar.xz.sha1 @@ -0,0 +1 @@ +8bba6e01a47b2cfd9e7429f77256db540031ff43 \ No newline at end of file diff --git a/util/bot/sde-win32.tar.bz2.sha1 b/util/bot/sde-win32.tar.bz2.sha1 deleted file mode 100644 index b96074703..000000000 --- a/util/bot/sde-win32.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -cc2d77ff4a221165a8bb13f43ccfbff6550b90c8 \ No newline at end of file diff --git a/util/bot/sde-win32.tar.xz.sha1 b/util/bot/sde-win32.tar.xz.sha1 new file mode 100644 index 000000000..dbaf87fd0 --- /dev/null +++ b/util/bot/sde-win32.tar.xz.sha1 @@ -0,0 +1 @@ +59ef225031e14e5ac257ada61d416f6ea0c9c080 \ No newline at end of file