mirror of
https://github.com/signalapp/libsignal.git
synced 2024-09-20 03:52:17 +02:00
Use a single source of truth for version file list
This commit is contained in:
parent
72aae8c00f
commit
bb44874400
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
# Keep crate versions and lib package versions in accord
|
# Keep crate versions and lib package versions in accord
|
||||||
|
|
||||||
|
import collections
|
||||||
import fileinput
|
import fileinput
|
||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
@ -39,6 +40,17 @@ def bridge_path(bridge):
|
|||||||
return os.path.join('rust', 'bridge', bridge, 'Cargo.toml')
|
return os.path.join('rust', 'bridge', bridge, 'Cargo.toml')
|
||||||
|
|
||||||
|
|
||||||
|
VERSION_FILES = [
|
||||||
|
('LibSignalClient.podspec', PODSPEC_PATTERN),
|
||||||
|
(os.path.join('java', 'build.gradle'), GRADLE_PATTERN),
|
||||||
|
(os.path.join('node', 'package.json'), NODE_PATTERN),
|
||||||
|
(os.path.join('rust', 'core', 'src', 'version.rs'), RUST_PATTERN),
|
||||||
|
(bridge_path('ffi'), CARGO_PATTERN),
|
||||||
|
(bridge_path('jni'), CARGO_PATTERN),
|
||||||
|
(bridge_path('node'), CARGO_PATTERN),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
|
os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
|
||||||
|
|
||||||
@ -46,32 +58,24 @@ def main():
|
|||||||
new_version = sys.argv[1]
|
new_version = sys.argv[1]
|
||||||
if new_version[0] == 'v':
|
if new_version[0] == 'v':
|
||||||
new_version = new_version[1:]
|
new_version = new_version[1:]
|
||||||
update_version('LibSignalClient.podspec', PODSPEC_PATTERN, new_version)
|
for (path, pattern) in VERSION_FILES:
|
||||||
update_version(os.path.join('java', 'build.gradle'), GRADLE_PATTERN, new_version)
|
update_version(path, pattern, new_version)
|
||||||
update_version(os.path.join('node', 'package.json'), NODE_PATTERN, new_version)
|
|
||||||
update_version(os.path.join('rust', 'core', 'src', 'version.rs'), RUST_PATTERN, new_version)
|
|
||||||
update_version(bridge_path('ffi'), CARGO_PATTERN, new_version)
|
|
||||||
update_version(bridge_path('jni'), CARGO_PATTERN, new_version)
|
|
||||||
update_version(bridge_path('node'), CARGO_PATTERN, new_version)
|
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
package_versions = {
|
found_versions = collections.defaultdict(list)
|
||||||
'swift': read_version('LibSignalClient.podspec', PODSPEC_PATTERN),
|
for (path, pattern) in VERSION_FILES:
|
||||||
'java': read_version(os.path.join('java', 'build.gradle'), GRADLE_PATTERN),
|
version = read_version(path, pattern)
|
||||||
'node': read_version(os.path.join('node', 'package.json'), NODE_PATTERN)
|
found_versions[version].append(path)
|
||||||
}
|
|
||||||
|
|
||||||
bridge_versions = {
|
if len(found_versions) != 1:
|
||||||
'swift': read_version(bridge_path('ffi'), CARGO_PATTERN),
|
print("ERROR: found inconsistent versions:")
|
||||||
'java': read_version(bridge_path('jni'), CARGO_PATTERN),
|
for (version, files) in sorted(found_versions.items()):
|
||||||
'node': read_version(bridge_path('node'), CARGO_PATTERN),
|
print(f"{version}:")
|
||||||
}
|
for file in files:
|
||||||
|
print(f" {file}")
|
||||||
|
|
||||||
for bridge in package_versions:
|
return 1
|
||||||
if bridge_versions[bridge] != package_versions[bridge]:
|
|
||||||
print("ERROR: Bridge %s has package version %s but crate version is %s" % (
|
|
||||||
bridge, package_versions[bridge], bridge_versions[bridge]))
|
|
||||||
return 1
|
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user