lol

electron: distinguish between revs and tags

authored by

Yureka and committed by
Yureka
65540e54 cb848436

+24 -24
+2 -2
pkgs/development/tools/electron/common.nix
··· 113 113 echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni 114 114 echo 'generate_location_tags = true' >> build/config/gclient_args.gni 115 115 116 - echo 'LASTCHANGE=${info.deps."src".args.rev}-refs/heads/master@{#0}' > build/util/LASTCHANGE 116 + echo 'LASTCHANGE=${info.deps."src".args.tag}-refs/heads/master@{#0}' > build/util/LASTCHANGE 117 117 echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime 118 118 119 119 cat << EOF > gpu/config/gpu_lists_version.h 120 120 /* Generated by lastchange.py, do not edit.*/ 121 121 #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_ 122 122 #define GPU_CONFIG_GPU_LISTS_VERSION_H_ 123 - #define GPU_LISTS_VERSION "${info.deps."src".args.rev}" 123 + #define GPU_LISTS_VERSION "${info.deps."src".args.tag}" 124 124 #endif // GPU_CONFIG_GPU_LISTS_VERSION_H_ 125 125 EOF 126 126
+9 -9
pkgs/development/tools/electron/info.json
··· 18 18 "args": { 19 19 "hash": "sha256-NVaErCSvuTQyt7yv2sc4aIX2J/6mxM648Wbbut2Jjxc=", 20 20 "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", 21 - "rev": "132.0.6834.210", 21 + "tag": "132.0.6834.210", 22 22 "url": "https://chromium.googlesource.com/chromium/src.git" 23 23 }, 24 24 "fetcher": "fetchFromGitiles" ··· 60 60 "hash": "sha256-NdeVWtmGpBqUuRtPBc0xLn7z4YNZ9p765a9nM3XdjCw=", 61 61 "owner": "electron", 62 62 "repo": "electron", 63 - "rev": "v34.5.5" 63 + "tag": "v34.5.5" 64 64 }, 65 65 "fetcher": "fetchFromGitHub" 66 66 }, ··· 397 397 "hash": "sha256-vc3Ztw8m0P96QoCjtyu2Nb0TpVMu9ifrVlkJY15aVbE=", 398 398 "owner": "nodejs", 399 399 "repo": "node", 400 - "rev": "v20.19.1" 400 + "tag": "v20.19.1" 401 401 }, 402 402 "fetcher": "fetchFromGitHub" 403 403 }, ··· 1295 1295 "args": { 1296 1296 "hash": "sha256-LL0lmb23zTjOwi8Sbz0Vb3Nj3ptqpRL/5V5rI8vXu0U=", 1297 1297 "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", 1298 - "rev": "134.0.6998.205", 1298 + "tag": "134.0.6998.205", 1299 1299 "url": "https://chromium.googlesource.com/chromium/src.git" 1300 1300 }, 1301 1301 "fetcher": "fetchFromGitiles" ··· 1337 1337 "hash": "sha256-rRrXXuCfS9X+00u7/18A3m8V+k9MK0QITuheQlHFZdQ=", 1338 1338 "owner": "electron", 1339 1339 "repo": "electron", 1340 - "rev": "v35.3.0" 1340 + "tag": "v35.3.0" 1341 1341 }, 1342 1342 "fetcher": "fetchFromGitHub" 1343 1343 }, ··· 1666 1666 "hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=", 1667 1667 "owner": "nodejs", 1668 1668 "repo": "node", 1669 - "rev": "v22.14.0" 1669 + "tag": "v22.14.0" 1670 1670 }, 1671 1671 "fetcher": "fetchFromGitHub" 1672 1672 }, ··· 2604 2604 "args": { 2605 2605 "hash": "sha256-7ykQd8jKE9aVfTBPrJnOGHQYhmm+gJoMX7kET7eYFXM=", 2606 2606 "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", 2607 - "rev": "136.0.7103.49", 2607 + "tag": "136.0.7103.49", 2608 2608 "url": "https://chromium.googlesource.com/chromium/src.git" 2609 2609 }, 2610 2610 "fetcher": "fetchFromGitiles" ··· 2646 2646 "hash": "sha256-mErVGqPBvplWEEOnEFnEdxDU34jc5YECLj18rU7E/XM=", 2647 2647 "owner": "electron", 2648 2648 "repo": "electron", 2649 - "rev": "v36.2.0" 2649 + "tag": "v36.2.0" 2650 2650 }, 2651 2651 "fetcher": "fetchFromGitHub" 2652 2652 }, ··· 2975 2975 "hash": "sha256-KXhkO1qKbf7/KktyLQcPGEzcIErsIKAUE89oGTP2mbI=", 2976 2976 "owner": "nodejs", 2977 2977 "repo": "node", 2978 - "rev": "v22.15.0" 2978 + "tag": "v22.15.0" 2979 2979 }, 2980 2980 "fetcher": "fetchFromGitHub" 2981 2981 },
+13 -13
pkgs/development/tools/electron/update.py
··· 60 60 return json.loads(output) 61 61 62 62 63 - def get_chromium_file(chromium_rev: str, filepath: str) -> str: 63 + def get_chromium_file(chromium_tag: str, filepath: str) -> str: 64 64 return base64.b64decode( 65 65 urlopen( 66 - f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_rev}/{filepath}?format=TEXT" 66 + f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_tag}/{filepath}?format=TEXT" 67 67 ).read() 68 68 ).decode("utf-8") 69 69 70 70 71 - def get_electron_file(electron_rev: str, filepath: str) -> str: 71 + def get_electron_file(electron_tag: str, filepath: str) -> str: 72 72 return ( 73 73 urlopen( 74 - f"https://raw.githubusercontent.com/electron/electron/{electron_rev}/{filepath}" 74 + f"https://raw.githubusercontent.com/electron/electron/{electron_tag}/{filepath}" 75 75 ) 76 76 .read() 77 77 .decode("utf-8") ··· 79 79 80 80 81 81 @memory.cache 82 - def get_chromium_gn_source(chromium_rev: str) -> dict: 82 + def get_chromium_gn_source(chromium_tag: str) -> dict: 83 83 gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'" 84 - gn_commit = re.search(gn_pattern, get_chromium_file(chromium_rev, "DEPS")).group(1) 84 + gn_commit = re.search(gn_pattern, get_chromium_file(chromium_tag, "DEPS")).group(1) 85 85 gn_prefetch: bytes = subprocess.check_output( 86 86 [ 87 87 "nix-prefetch-git", ··· 102 102 } 103 103 104 104 @memory.cache 105 - def get_electron_yarn_hash(electron_rev: str) -> str: 105 + def get_electron_yarn_hash(electron_tag: str) -> str: 106 106 print(f"prefetch-yarn-deps", file=sys.stderr) 107 107 with tempfile.TemporaryDirectory() as tmp_dir: 108 108 with open(tmp_dir + "/yarn.lock", "w") as f: 109 - f.write(get_electron_file(electron_rev, "yarn.lock")) 109 + f.write(get_electron_file(electron_tag, "yarn.lock")) 110 110 return ( 111 111 subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"]) 112 112 .decode("utf-8") ··· 114 114 ) 115 115 116 116 @memory.cache 117 - def get_chromium_npm_hash(chromium_rev: str) -> str: 117 + def get_chromium_npm_hash(chromium_tag: str) -> str: 118 118 print(f"prefetch-npm-deps", file=sys.stderr) 119 119 with tempfile.TemporaryDirectory() as tmp_dir: 120 120 with open(tmp_dir + "/package-lock.json", "w") as f: 121 - f.write(get_chromium_file(chromium_rev, "third_party/node/package-lock.json")) 121 + f.write(get_chromium_file(chromium_tag, "third_party/node/package-lock.json")) 122 122 return ( 123 123 subprocess.check_output( 124 124 ["prefetch-npm-deps", tmp_dir + "/package-lock.json"] ··· 131 131 def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]: 132 132 133 133 tasks = [] 134 - a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["rev"]))) 134 + a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"]))) 135 135 tasks.append(delayed(a)()) 136 136 a = lambda: ( 137 137 ( 138 138 "chromium_npm_hash", 139 - get_chromium_npm_hash(gclient_data["src"]["args"]["rev"]), 139 + get_chromium_npm_hash(gclient_data["src"]["args"]["tag"]), 140 140 ) 141 141 ) 142 142 tasks.append(delayed(a)()) ··· 155 155 **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, 156 156 "chromium": { 157 157 "version": m["chrome"], 158 - "deps": get_chromium_gn_source(gclient_data["src"]["args"]["rev"]), 158 + "deps": get_chromium_gn_source(gclient_data["src"]["args"]["tag"]), 159 159 }, 160 160 **task_results, 161 161 },