Skip to content

Commit 05d9c23

Browse files
[dev] remove stupid macOS .DS_Store file from angle checksum computation
1 parent 4bb32b5 commit 05d9c23

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

scripts/dev.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,11 @@ def check_dawn():
131131
if artifact in sums:
132132
if os.path.isfile(artifact):
133133
s = checksum.filesum(artifact)
134-
if sums[artifact]['commit'] != DAWN_COMMIT or s != sums[artifact]['sum']:
135-
messages.append(f"build/dawn.out/{artifact} doesn't match checksum")
134+
if sums[artifact]['commit'] != DAWN_COMMIT:
135+
messages.append(f"build/dawn.out/{artifact} doesn't match dawn commit.\n note: expected {DAWN_COMMIT}, got {sums[artifact]['commit']}")
136+
up_to_date = False
137+
elif s != sums[artifact]['sum']:
138+
messages.append(f"build/dawn.out/{artifact} doesn't match checksum.\n note: expected {sums[artifact]['sum']}, got {s}")
136139
up_to_date = False
137140
else:
138141
messages.append(f"build/dawn.out/{artifact} not found")
@@ -346,12 +349,12 @@ def check_angle():
346349
messages = ["malformed build/angle.out/angle.json"]
347350
up_to_date = False
348351
elif sums['commit'] != ANGLE_COMMIT:
349-
messages.append("build/angle.out doesn't match the required commit")
352+
messages.append(f"build/angle.out doesn't match the required angle commit.\n note: expected {ANGLE_COMMIT}, got {sums['commit']}")
350353
up_to_date = False
351354
else:
352-
s = checksum.dirsum('.', excluded_files=["angle.json"])
355+
s = checksum.dirsum('.', excluded_files=["angle.json", ".DS_Store"])
353356
if s != sums['sum']:
354-
messages.append("build/angle.out doesn't match checksum")
357+
messages.append(f"build/angle.out doesn't match checksum.\n note: expected {sums['sum']}, got {s}")
355358
up_to_date = False
356359
else:
357360
messages = [["build/angle.out/angle.json not found"]]

0 commit comments

Comments
 (0)