Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Default nightly builds to layout 2020

Browse source 
Signed-off-by: Mukilan Thiyagarajan <me@mukilan.in>
This commit is contained in:
Mukilan Thiyagarajan 2023-06-20 11:15:58 +05:30
parent ffccc5c88b
commit bca529da92
2 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
.github/workflows/nightly.yml vendored
View file

@ -59,11 +59,11 @@ jobs:
needs: needs:
- create-draft-release - create-draft-release
- upload-linux - upload-linux
- upload-linux-2020 - upload-linux-2013
- upload-win - upload-win
- upload-win-2020 - upload-win-2013
- upload-mac - upload-mac
- upload-mac-2020 - upload-mac-2013
upload-win: upload-win:
# This job is only useful when run on upstream servo. # This job is only useful when run on upstream servo.
@ -73,20 +73,20 @@ jobs:
- create-draft-release - create-draft-release
uses: ./.github/workflows/windows.yml uses: ./.github/workflows/windows.yml
with: with:
layout: '2013' layout: '2020'
upload: true upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }} github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit secrets: inherit
upload-win-2020: upload-win-2013:
# This job is only useful when run on upstream servo. # This job is only useful when run on upstream servo.
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch' if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
name: Upload nightly (Windows layout-2020) name: Upload nightly (Windows layout-2013)
needs: needs:
- create-draft-release - create-draft-release
uses: ./.github/workflows/windows.yml uses: ./.github/workflows/windows.yml
with: with:
layout: '2020' layout: '2013'
upload: true upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }} github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit secrets: inherit
@ -99,20 +99,20 @@ jobs:
- create-draft-release - create-draft-release
uses: ./.github/workflows/mac.yml uses: ./.github/workflows/mac.yml
with: with:
layout: '2013' layout: '2020'
upload: true upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }} github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit secrets: inherit
upload-mac-2020: upload-mac-2013:
# This job is only useful when run on upstream servo. # This job is only useful when run on upstream servo.
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch' if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
name: Upload nightly (macOS layout-2020) name: Upload nightly (macOS layout-2013)
needs: needs:
- create-draft-release - create-draft-release
uses: ./.github/workflows/mac.yml uses: ./.github/workflows/mac.yml
with: with:
layout: '2020' layout: '2013'
upload: true upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }} github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit secrets: inherit
@ -124,21 +124,21 @@ jobs:
needs: needs:
- create-draft-release - create-draft-release
uses: ./.github/workflows/linux.yml uses: ./.github/workflows/linux.yml
with:
layout: '2013'
upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit
upload-linux-2020:
# This job is only useful when run on upstream servo.
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
name: Upload nightly (Linux layout-2020)
needs:
- create-draft-release
uses: ./.github/workflows/linux.yml
with: with:
layout: '2020' layout: '2020'
upload: true upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }} github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit secrets: inherit
upload-linux-2013:
# This job is only useful when run on upstream servo.
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
name: Upload nightly (Linux layout-2013)
needs:
- create-draft-release
uses: ./.github/workflows/linux.yml
with:
layout: '2013'
upload: true
github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
secrets: inherit

10
python/servo/package_commands.py
View file

@ -518,9 +518,9 @@ class PackageCommands(CommandBase):
package_hash_fileobj = io.BytesIO(package_hash.encode('utf-8')) package_hash_fileobj = io.BytesIO(package_hash.encode('utf-8'))
if '2020' in platform: if '2020' in platform:
asset_name = f'servo-latest-layout-2020.{extension}'
else:
asset_name = f'servo-latest.{extension}' asset_name = f'servo-latest.{extension}'
else:
asset_name = f'servo-latest-legacy-layout.{extension}'
release.upload_asset(package, name=asset_name) release.upload_asset(package, name=asset_name)
release.upload_asset_from_memory( release.upload_asset_from_memory(
@ -545,7 +545,11 @@ class PackageCommands(CommandBase):
BUCKET = 'servo-builds2' BUCKET = 'servo-builds2'
DISTRIBUTION_ID = 'EJ8ZWSJKFCJS2' DISTRIBUTION_ID = 'EJ8ZWSJKFCJS2'
nightly_dir = 'nightly/{}'.format(platform) if '2020' in platform:
nightly_dir = 'nightly/{}'.format(platform.replace('-layout2020', ''))
else:
nightly_dir = 'nightly/{}-legacy-layout'.format(platform)
filename = nightly_filename(package, timestamp) filename = nightly_filename(package, timestamp)
package_upload_key = '{}/{}'.format(nightly_dir, filename) package_upload_key = '{}/{}'.format(nightly_dir, filename)
extension = path.basename(package).partition('.')[2] extension = path.basename(package).partition('.')[2]