Skip to content

Commit

Permalink
testing why angle hash is not the same when building and when checkin…
Browse files Browse the repository at this point in the history
…g...
  • Loading branch information
martinfouilleul committed Oct 3, 2024
1 parent 479375c commit ff09463
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
- name: Package
run: |
if [ ${{ inputs.version }} != '' ] ; then
if [ "${{ inputs.version }}" != '' ] ; then
./orcadev install --version ${{ inputs.version }} orca
else
./orcadev install orca
Expand Down
7 changes: 5 additions & 2 deletions scripts/checksum.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import hashlib
import json
import os
import re

from .log import *
from log import *


def checkfile(filepath):
Expand Down Expand Up @@ -85,6 +86,8 @@ def dirsum(
if fname in excluded_files:
continue

print(f"{fname}: {_filehash(os.path.join(root, fname), hash_func)}")

hashvalues.append(_filehash(os.path.join(root, fname), hash_func))

if include_paths:
Expand Down Expand Up @@ -118,5 +121,5 @@ def _reduce_hash(hashlist, hashfunc):
hasher = hashfunc()
for hashvalue in sorted(hashlist):
hasher.update(hashvalue.encode("utf-8"))
print(f"reduced: {hasher.hexdigest()}")
return hasher.hexdigest()

4 changes: 2 additions & 2 deletions scripts/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ def build_platform_layer_internal(release):
msg.more(" * For macOS, go to https://github.com/orca-app/orca/actions/workflows/build-angle-mac.yaml")
msg.more(" * Click on \"Run workflow\" to tigger a new run, or download artifacts from a previous run")
msg.more(" * Put the contents of the artifacts folder in './build/angle.out'")
exit()
exit(1)

dawn_ok, dawn_messages = check_dawn()
if not dawn_ok:
Expand All @@ -765,7 +765,7 @@ def build_platform_layer_internal(release):
msg.more(" * For macOS, go to https://github.com/orca-app/orca/actions/workflows/build-dawn-mac.yaml")
msg.more(" * Click on \"Run workflow\" to tigger a new run, or download artifacts from a previous run")
msg.more(" * Put the contents of the artifacts folder in './build/dawn.out'")
exit()
exit(1)

os.makedirs("build/bin", exist_ok=True)
os.makedirs("build/lib", exist_ok=True)
Expand Down

0 comments on commit ff09463

Please sign in to comment.