Update cmd/update-release/update-release.py script to bundle v2 prereleases, and bundle 2.0.0-rc.16

Author: xor-gate

cmd/update-release/update-release.py

@@ -31,15 +31,74 @@
 if 'tag_name' not in data:
 	raise ValueError("tag_name not present in latest_url")
 
+import urllib.request
+import json
+import semver
+
+def get_latest_v2_prerelease_tag_name(repo_owner, repo_name):
+    """
+    Fetches the latest v2 prerelease tag_name from a GitHub repository's releases.
+
+    Args:
+        repo_owner (str): The owner of the GitHub repository (e.g., 'syncthing').
+        repo_name (str): The name of the GitHub repository (e.g., 'syncthing').
+
+    Returns:
+        str or None: The tag_name of the latest v2 prerelease, or None if not found.
+    """
+    url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/releases"
+    try:
+        with urllib.request.urlopen(url) as response:
+            if response.getcode() == 200:
+                data = json.loads(response.read().decode('utf-8'))
+            else:
+                print(f"Error fetching data: HTTP {response.getcode()}")
+                return None
+    except urllib.error.URLError as e:
+        print(f"Error connecting to GitHub API: {e.reason}")
+        return None
+    except json.JSONDecodeError:
+        print("Error decoding JSON response.")
+        return None
+
+    v2_prereleases = []
+    for release in data:
+        tag_name = release.get('tag_name')
+        prerelease = release.get('prerelease')
+
+        if tag_name and prerelease:
+            try:
+                version = semver.Version.parse(tag_name.lstrip('v')) # Remove 'v' prefix if present
+                if version.major == 2 and version.prerelease:
+                    v2_prereleases.append(version)
+            except ValueError:
+                # Not a valid semver string, skip
+                continue
+
+    if not v2_prereleases:
+        return None
+
+    # Sort the prereleases to find the latest
+    latest_v2_prerelease = max(v2_prereleases)
+    return f"v{latest_v2_prerelease}" # Re-add the 'v' prefix for consistency
+
 ###
 # Parse the tag version and generate CFBundleShortVersionString and CFBundleVersion
 ###
+owner = "syncthing"
+repo = "syncthing"
+latest_tag = get_latest_v2_prerelease_tag_name(owner, repo)
+
+if latest_tag:
+	print(f"The latest v2 prerelease tag_name for {owner}/{repo} is: {latest_tag}")
+else:
+	print(f"No v2 prerelease found for {owner}/{repo}.")
 
 # Ugly hack because of https://github.com/python-semver/python-semver/issues/137
-tag_name = data['tag_name'].replace('v', '')
+tag_name = latest_tag.replace('v', '')
 version = semver.VersionInfo.parse(tag_name)
 
-CFBundleShortVersionString = "{}-{:d}".format(
+CFBundleShortVersionString = "{}+{:d}".format(
 	str(version),
 	distVersion)
 CFBundleVersion = "{:d}{:03d}{:03d}{:02d}".format(

syncthing/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.29.6-1</string>
+	<string>2.0.0-rc.16+1</string>
 	<key>CFBundleVersion</key>
-	<string>102900601</string>
+	<string>200000001</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

syncthing/Scripts/syncthing-resource.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Download and unpack syncthing into ${PRODUCT_NAME}.app/Contents/Resources
-SYNCTHING_VERSION="1.29.6"
+SYNCTHING_VERSION="2.0.0-rc.16"
 SYNCTHING_DIST_URL="https://github.com/syncthing/syncthing/releases/download"
 SYNCTHING_TARBALL_URL="${SYNCTHING_DIST_URL}/v${SYNCTHING_VERSION}/syncthing-macos-universal-v${SYNCTHING_VERSION}.zip"