Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (277741 => 277742)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-19 19:15:51 UTC (rev 277742)
@@ -179,7 +179,7 @@
name = "trigger-crash-log-submission"
description = ["triggering crash log submission"]
descriptionDone = ["triggered crash log submission"]
- command = ["python", "./Tools/CISupport/trigger-crash-log-submission"]
+ command = ["python3", "Tools/CISupport/trigger-crash-log-submission"]
class WaitForCrashCollection(shell.Compile):
@@ -186,7 +186,7 @@
name = "wait-for-crash-collection"
description = ["waiting for crash collection to quiesce"]
descriptionDone = ["crash collection has quiesced"]
- command = ["python", "./Tools/CISupport/wait-for-crash-collection", "--timeout", str(5 * 60)]
+ command = ["python3", "Tools/CISupport/wait-for-crash-collection", "--timeout", str(5 * 60)]
class CleanBuildIfScheduled(shell.Compile):
@@ -193,7 +193,7 @@
name = "delete-WebKitBuild-directory"
description = ["deleting WebKitBuild directory"]
descriptionDone = ["deleted WebKitBuild directory"]
- command = ["python", "./Tools/CISupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+ command = ["python3", "Tools/CISupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
def start(self):
if not self.getProperty('is_clean'):
@@ -206,7 +206,7 @@
name = "delete-stale-build-files"
description = ["deleting stale build files"]
descriptionDone = ["deleted stale build files"]
- command = ["python", "./Tools/CISupport/delete-stale-build-files", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+ command = ["python3", "Tools/CISupport/delete-stale-build-files", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
def start(self):
if self.getProperty('is_clean'): # Nothing to be done if WebKitBuild had been removed.
@@ -322,7 +322,7 @@
class ArchiveBuiltProduct(shell.ShellCommand):
- command = ["python", "./Tools/CISupport/built-product-archive",
+ command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive"]
name = "archive-built-product"
description = ["archiving built product"]
@@ -331,7 +331,7 @@
class ArchiveMinifiedBuiltProduct(ArchiveBuiltProduct):
- command = ["python", "./Tools/CISupport/built-product-archive",
+ command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive", "--minify"]
@@ -358,7 +358,7 @@
class ExtractBuiltProduct(shell.ShellCommand):
- command = ["python", "./Tools/CISupport/built-product-archive",
+ command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "extract"]
name = "extract-built-product"
description = ["extracting built product"]
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (277741 => 277742)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-19 19:15:51 UTC (rev 277742)
@@ -276,7 +276,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=True,
- command=['python', './Tools/CISupport/clean-build', '--platform=ios-14', '--release'],
+ command=['python3', 'Tools/CISupport/clean-build', '--platform=ios-14', '--release'],
) + 0,
)
self.expectOutcome(result=SUCCESS, state_string='deleted WebKitBuild directory')
@@ -292,7 +292,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=True,
- command=['python', './Tools/CISupport/clean-build', '--platform=ios-simulator-14', '--debug'],
+ command=['python3', 'Tools/CISupport/clean-build', '--platform=ios-simulator-14', '--debug'],
) + 2
+ ExpectShell.log('stdio', stdout='Unexpected error.'),
)
Modified: trunk/Tools/CISupport/built-product-archive (277741 => 277742)
--- trunk/Tools/CISupport/built-product-archive 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/built-product-archive 2021-05-19 19:15:51 UTC (rev 277742)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2009-2020 Apple Inc. All rights reserved.
# Copyright (C) 2012 Google Inc. All rights reserved.
Modified: trunk/Tools/CISupport/clean-build (277741 => 277742)
--- trunk/Tools/CISupport/clean-build 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/clean-build 2021-05-19 19:15:51 UTC (rev 277742)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
# Copyright (C) 2012 Google Inc. All rights reserved.
#
Modified: trunk/Tools/CISupport/delete-stale-build-files (277741 => 277742)
--- trunk/Tools/CISupport/delete-stale-build-files 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/delete-stale-build-files 2021-05-19 19:15:51 UTC (rev 277742)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013-2020 Apple Inc. All rights reserved.
# Copyright (C) 2012 Google Inc. All rights reserved.
#
Modified: trunk/Tools/CISupport/trigger-crash-log-submission (277741 => 277742)
--- trunk/Tools/CISupport/trigger-crash-log-submission 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/trigger-crash-log-submission 2021-05-19 19:15:51 UTC (rev 277742)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: trunk/Tools/CISupport/wait-for-crash-collection (277741 => 277742)
--- trunk/Tools/CISupport/wait-for-crash-collection 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/wait-for-crash-collection 2021-05-19 19:15:51 UTC (rev 277742)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: trunk/Tools/ChangeLog (277741 => 277742)
--- trunk/Tools/ChangeLog 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/ChangeLog 2021-05-19 19:15:51 UTC (rev 277742)
@@ -1,3 +1,27 @@
+2021-05-19 Aakash Jain <[email protected]>
+
+ Use Python 3 for running various scripts on build.webkit.org
+ https://bugs.webkit.org/show_bug.cgi?id=225929
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/build-webkit-org/steps.py: Use Python 3. Also removed ./ from invocation to match with ews code.
+ (TriggerCrashLogSubmission):
+ (WaitForCrashCollection):
+ (CleanBuildIfScheduled):
+ (DeleteStaleBuildFiles):
+ (ArchiveBuiltProduct):
+ (ArchiveMinifiedBuiltProduct):
+ (ExtractBuiltProduct):
+ * CISupport/build-webkit-org/steps_unittest.py: Updated unit-tests.
+ (TestCleanBuildIfScheduled.test_success):
+ (TestCleanBuildIfScheduled.test_failure):
+ * CISupport/built-product-archive: Updated shebang to Python 3.
+ * CISupport/clean-build:
+ * CISupport/delete-stale-build-files:
+ * CISupport/trigger-crash-log-submission:
+ * CISupport/wait-for-crash-collection:
+
2021-05-19 Sam Weinig <[email protected]>
Update Base64 encoding/decoding to match more modern WebKit conventions
