diff --git a/build.sh b/build.sh index e92b25d..cb12d0c 100755 --- a/build.sh +++ b/build.sh @@ -12,7 +12,8 @@ REVISION=$(echo $VERSION | cut -d '.' -f 3) BUILD_SHA=$(echo $VERSION | cut -d '.' -f 4) # Define current build and commit SHAs -CURRENT_BUILD_SHA=$(find . -type f -name '*.wasm' | xargs -I{} sha1sum add_time_metric.diff build.sh requirements.txt Dockerfile wasmscore.py {} | sha1sum | cut -c 1-7 | awk '{print $1}') +# Sort -n/-h produced different sort results for inside vs outside the countainer so using sort -d +CURRENT_BUILD_SHA=$(find . -type f -name '*.wasm' | sort -d | xargs -I{} sha1sum add_time_metric.diff build.sh requirements.txt Dockerfile wasmscore.py {} | sha1sum | cut -c 1-7 | awk '{print $1}') # Define architecutre and kernel ARCH=$(uname -m | awk '{print tolower($0)}') diff --git a/config.inc b/config.inc index 636dba9..425e7cf 100644 --- a/config.inc +++ b/config.inc @@ -1,3 +1,3 @@ # Global variables used by scripts for docker building and launching IMAGE_NAME="wasmscore" -IMAGE_VERSION="v0.1.1.54bbb97" +IMAGE_VERSION="v0.1.1.63d6828" diff --git a/wasmscore.py b/wasmscore.py index 1db173c..b667196 100755 --- a/wasmscore.py +++ b/wasmscore.py @@ -862,7 +862,7 @@ def check_version(): stderr=subprocess.STDOUT, ).strip() calculated_build_version = subprocess.check_output( - "find . -type f -name '*.wasm' | xargs -I{} sha1sum add_time_metric.diff build.sh requirements.txt Dockerfile wasmscore.py {} | sha1sum | cut -c 1-7 | awk '{print $1}'", + "find . -type f -name '*.wasm' | sort -d | xargs -I{} sha1sum add_time_metric.diff build.sh requirements.txt Dockerfile wasmscore.py {} | sha1sum | cut -c 1-7 | awk '{print $1}'", shell=True, text=True, stderr=subprocess.STDOUT,