Fix/ci runtime cache build

housekeeping/docker/kagome-dev/get_wasmedge_version.py

@@ -1,25 +1,39 @@
 import re
 import sys
 
-def extract_version_and_sha(config_file_path, package_name):
+
+def extract_version(config_file_path, package_name):
     with open(config_file_path, 'r') as file:
         content = file.read()
 
-    version_pattern = re.compile(r'hunter_config\(\s*' + re.escape(package_name) + r'\s*.*?URL\s+.*?/tags/([^\s/]+)\.zip', re.DOTALL)
-    sha_pattern = re.compile(r'hunter_config\(\s*' + re.escape(package_name) + r'\s*.*?SHA1\s+(\w+)', re.DOTALL)
-
+    version_pattern = re.compile(r'hunter_config\(\s*' + re.escape(package_name) + r'\s*.*?URL\s+.*?/heads/.*?/([^\s/]+)\.zip', re.DOTALL)
     version_match = version_pattern.search(content)
-    sha_match = sha_pattern.search(content)
 
     version = version_match.group(1) if version_match else None
+    return version
+
+
+def extract_sha(cmakelists_file_path):
+    with open(cmakelists_file_path, 'r') as file:
+        content = file.read()
+
+    sha_pattern = re.compile(r'set\s*\(\s*WASMEDGE_ID\s*([a-fA-F0-9]+)\s*\)')
+    sha_match = sha_pattern.search(content)
+
     sha = sha_match.group(1)[:7] if sha_match else None
+    return sha
 
-    return version, sha
 
 if __name__ == "__main__":
     config_file_path = '../../../cmake/Hunter/config.cmake'
+    cmakelists_file_path = '../../../CMakeLists.txt'
     package_name = 'WasmEdge'
 
-    version, sha = extract_version_and_sha(config_file_path, package_name)
-    print(f"{version}-{sha}")
-
+    version = extract_version(config_file_path, package_name)
+
+    sha = extract_sha(cmakelists_file_path)
+
+    if version and sha:
+        print(f"{version}-{sha}")
+    else:
+        print("Failed to extract version and SHA")

zombienet/precompile.sh

@@ -15,10 +15,10 @@ undying-collator export-genesis-wasm > $DIR/undying-collator.json
 polkadot-parachain export-genesis-wasm > $DIR/polkadot-parachain.json
 polkadot build-spec --chain westend-local --raw > $DIR/westend-local.json
 
-for id in {2000..2002}
+for id in $(seq 2000 2002)
 do
   polkadot-parachain export-genesis-wasm --chain glutton-westend-local-${id} \
-    > $DIR/glutton-parachain-${id}.json
+    > "${DIR}/glutton-parachain-${id}.json"
 done
 
 kagome --tmp --chain $DIR/rococo-local.json \
@@ -32,8 +32,8 @@ kagome --tmp --chain $DIR/westend-local.json \
 kagome --tmp --chain ./old/0009-basic-warp-sync/gen-db-raw.json \
   --precompile-relay
 
-for id in {2000..2002}
+for id in $(seq 2000 2002)
 do
   kagome --tmp --chain $DIR/rococo-local.json \
-    --precompile-para $DIR/glutton-parachain-${id}.json
+    --precompile-para "${DIR}/glutton-parachain-${id}.json"
 done