AaronFiore/electrum
1
0
Fork 0
Code Activity

contrib/release_www.sh: put android versionCode in "version" file

Browse Source 
This can be used by the F-Droid buildserver to detect new versions
and release updates automatically.

ref:
https://github.com/spesmilo/electrum/pull/9221#issuecomment-2386549086
https://f-droid.org/en/docs/Build_Metadata_Reference/#UpdateCheckMode
This commit is contained in:
SomberNight
2024-10-07 14:32:46 +00:00
parent def89a90bc
commit 70c70eec35
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/android/get_apk_versioncode.py
View File

@@ -9,6 +9,7 @@ ARCH_DICT = {
"arm64-v8a": "3", "arm64-v8a": "3",
"armeabi-v7a": "2", "armeabi-v7a": "2",
"x86": "1", "x86": "1",
"null": "0",
} }
@@ -58,4 +59,5 @@ if __name__ == '__main__':
print(f" should be one of: {list(ARCH_DICT.keys())}", file=sys.stderr) print(f" should be one of: {list(ARCH_DICT.keys())}", file=sys.stderr)
sys.exit(1) sys.exit(1)
version_code = get_android_versioncode(arch_name=android_arch) version_code = get_android_versioncode(arch_name=android_arch)
assert isinstance(version_code, int), f"{version_code=!r} must be an int."
print(version_code, file=sys.stdout) print(version_code, file=sys.stdout)

12
contrib/release_www.sh
View File

@@ -37,16 +37,26 @@ fi
VERSION=$("$CONTRIB"/print_electrum_version.py) VERSION=$("$CONTRIB"/print_electrum_version.py)
info "VERSION: $VERSION" info "VERSION: $VERSION"
ANDROID_VERSIONCODE_NULLARCH=$("$CONTRIB"/android/get_apk_versioncode.py "null")
# ^ note: should parse as an integer in the final json
info "ANDROID_VERSIONCODE_NULLARCH: $ANDROID_VERSIONCODE_NULLARCH"
set -x set -x
info "updating www repo" info "updating www repo"
./contrib/make_download "$WWW_DIR" ./contrib/make_download "$WWW_DIR"
info "signing the version announcement file" info "signing the version announcement file"
sig=$(./run_electrum -o signmessage $ELECTRUM_SIGNING_ADDRESS $VERSION -w $ELECTRUM_SIGNING_WALLET) sig=$(./run_electrum -o signmessage $ELECTRUM_SIGNING_ADDRESS $VERSION -w $ELECTRUM_SIGNING_WALLET)
# note: the contents of "extradata" are currently not signed. We could add another field, extradata_sigs,
# containing signature(s) for "extradata". extradata, being json, would have to be canonically
# serialized before signing.
cat <<EOF > "$WWW_DIR"/version cat <<EOF > "$WWW_DIR"/version
{ {
"version": "$VERSION", "version": "$VERSION",
"signatures": {"$ELECTRUM_SIGNING_ADDRESS": "$sig"} "signatures": {"$ELECTRUM_SIGNING_ADDRESS": "$sig"},
"extradata": {
"android_versioncode_nullarch": $ANDROID_VERSIONCODE_NULLARCH
}
} }
EOF EOF