From d31cdb682f717d6dbdbd57d60855fd92d822cd66 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Wed, 28 Jun 2023 10:07:08 +0200 Subject: Make the choice of layout runtime setting Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com> --- python/servo/package_commands.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'python/servo/package_commands.py') diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index d0e7d84a67a..b9c70a22f50 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -502,11 +502,7 @@ class PackageCommands(CommandBase): release = nightly_repo.get_release(github_release_id) package_hash_fileobj = io.BytesIO(package_hash.encode('utf-8')) - if '2020' in platform: - asset_name = f'servo-latest.{extension}' - else: - asset_name = f'servo-latest-legacy-layout.{extension}' - + asset_name = f'servo-latest.{extension}' release.upload_asset(package, name=asset_name) release.upload_asset_from_memory( package_hash_fileobj, @@ -530,11 +526,7 @@ class PackageCommands(CommandBase): BUCKET = 'servo-builds2' DISTRIBUTION_ID = 'EJ8ZWSJKFCJS2' - if '2020' in platform: - nightly_dir = 'nightly/{}'.format(platform.replace('-layout2020', '')) - else: - nightly_dir = 'nightly/{}-legacy-layout'.format(platform) - + nightly_dir = f'nightly/{platform}' filename = nightly_filename(package, timestamp) package_upload_key = '{}/{}'.format(nightly_dir, filename) extension = path.basename(package).partition('.')[2] -- cgit v1.2.3