Skip to content

Commit

Permalink
Unreviewed, fix [ macOS ] Failed to download built product from build…
Browse files Browse the repository at this point in the history
… master

rdar://125249462
https://bugs.webkit.org/show_bug.cgi?id=271478

Changes revision to match DownloadBuiltProductFromMaster step.

* Tools/CISupport/build-webkit-org/steps.py:
(GenerateS3URL.__init__):
(GenerateS3URL.run):
* Tools/CISupport/build-webkit-org/steps_unittest.py:

Canonical link: https://commits.webkit.org/276560@main
  • Loading branch information
briannafan committed Mar 22, 2024
1 parent c41264f commit a86cc84
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Tools/CISupport/build-webkit-org/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ def __init__(self, identifier, extension='zip', content_type=None, minified=Fals
self.minified = minified
kwargs['command'] = [
'python3', '../Shared/generate-s3-url',
'--revision', WithProperties('%(revision)s'),
'--revision', WithProperties('%(archive_revision)s'),
'--identifier', self.identifier,
]
if extension:
Expand Down Expand Up @@ -1509,7 +1509,7 @@ def run(self):
self.build.s3url = match.group('url')
print(f'build: {build_url}, url for GenerateS3URL: {self.build.s3url}')
bucket_url = S3_BUCKET_MINIFIED if self.minified else S3_BUCKET
self.build.s3_archives.append(S3URL + f"{bucket_url}/{self.identifier}/{self.getProperty('revision')}.{self.extension}")
self.build.s3_archives.append(S3URL + f"{bucket_url}/{self.identifier}/{self.getProperty('archive_revision')}.{self.extension}")
defer.returnValue(rc)
else:
print(f'build: {build_url}, logs for GenerateS3URL:\n{log_text}')
Expand Down
2 changes: 1 addition & 1 deletion Tools/CISupport/build-webkit-org/steps_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,7 @@ def tearDown(self):

def configureStep(self, identifier='mac-highsierra-x86_64-release', extension='zip', content_type=None):
self.setupStep(GenerateS3URL(identifier, extension=extension, content_type=content_type))
self.setProperty('revision', '1234')
self.setProperty('archive_revision', '1234')

def disabled_test_success(self):
# TODO: Figure out how to pass logs to unit-test for MasterShellCommand steps
Expand Down

0 comments on commit a86cc84

Please sign in to comment.