Skip to content

Commit 52d0ca8

Browse files
committed
Update swift in CI to 5.5.3
1 parent 297449f commit 52d0ca8

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ stages:
8787
containerImage: 'swift:5.4.3-bionic'
8888
linuxSwift55:
8989
imageName: 'ubuntu-18.04'
90-
containerImage: 'swift:5.5.2-bionic'
90+
containerImage: 'swift:5.5.3-bionic'
9191
pool:
9292
vmImage: $(imageName)
9393
container: $[ variables['containerImage'] ]
@@ -111,7 +111,7 @@ stages:
111111
SWIFT_VERSION: '5.4.3'
112112
windowsSwift55:
113113
imageName: 'windows-2019'
114-
SWIFT_VERSION: '5.5.1'
114+
SWIFT_VERSION: '5.5.3'
115115
pool:
116116
vmImage: $(imageName)
117117
variables:

benchmarks.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def str_compare(self, base) -> str:
119119
else:
120120
output += "OK "
121121
stat_keeper.ok()
122-
output += " | {self_avg:<6s} {self_rsd:6s}% | {base_avg:<6s} {base_rsd:>6s}% | {group}/{name}".format(self_avg=self.avg,
122+
output += " | {self_avg:<6s} {self_rsd:6s}% | {base_avg:<6s} {base_rsd:>6s}% | {group}/{name}".format(self_avg=self.avg,
123123
self_rsd=self.rel_std_dev, base_avg=base.avg, base_rsd=base.rel_std_dev, name=self.test_name, group=self.group_name)
124124
return output
125125

@@ -202,8 +202,8 @@ def default(self, o):
202202
for group_name, group in o.groups.items():
203203
results_out = []
204204
for result in group.results.values():
205-
results_out.append({"name": result.test_name,
206-
"avg": result.avg,
205+
results_out.append({"name": result.test_name,
206+
"avg": result.avg,
207207
"rel_std_dev": result.rel_std_dev,
208208
"iter_count": result.iter_count})
209209
group_out = {"group_name": group_name, "results": results_out}
@@ -255,7 +255,7 @@ def _sprun(command):
255255
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
256256
if result.returncode != 0:
257257
raise subprocess.CalledProcessError(result.returncode, command, output=result.stdout, stderr=result.stderr)
258-
return result
258+
return result
259259

260260
def action_run(args):
261261
# Output format of 'swift test' differs between macOS and Linux platforms.
@@ -267,7 +267,7 @@ def action_run(args):
267267
regex = (r"Test Case '(.+Benchmarks)\.(test.+)'.+average: (\d+.\d+), "
268268
r"relative standard deviation: (\d+.\d+)\%, values: \[(.*)\]")
269269
else:
270-
raise RuntimeError("Unknown platform: " + sys.platform)
270+
raise RuntimeError("Unknown platform: " + sys.platform)
271271
p = re.compile(regex)
272272
iter_p = re.compile(r"(\d+.\d+)")# For calculating number of iterations.
273273

@@ -306,12 +306,12 @@ def action_run(args):
306306
if len(groups) == 0:
307307
print("No benchmarks have been found according to the specified options. Exiting...")
308308
return
309-
309+
310310
print("Benchmarking...")
311311
swift_ver = subprocess.run(swift_command + ["--version"], stdout=subprocess.PIPE, check=True,
312312
universal_newlines=True).stdout
313313
timestamp = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M UTC")
314-
bin_path = _sprun(swift_command + ["build", "--show-bin-path", "-c", "release"]).stdout.decode().splitlines()[0] + "/BitByteData.swiftmodule"
314+
bin_path = _sprun(swift_command + ["build", "--show-bin-path", "-c", "release"]).stdout.decode().splitlines()[0] + "/BitByteData.swiftmodule"
315315
binary_size = str(os.stat(bin_path).st_size)
316316
print(swift_ver, end="")
317317
print("Timestamp: {0}".format(timestamp))
@@ -346,7 +346,7 @@ def action_run(args):
346346
print(result.str_compare(base_result))
347347
else:
348348
print(result)
349-
349+
350350
if base is not None:
351351
print(stat_keeper.summary())
352352

0 commit comments

Comments
 (0)