🔄 synced local '.github/workflows/update-releases-properties.yml' with remote '.releases/update-releases-properties.yml'

Author: N6REJ

.github/workflows/update-releases-properties.yml

@@ -106,9 +106,13 @@ jobs:
           # Extract assets that end with .7z only
           assets = []
           
-          # Special handling for modules where filename prefix differs from module name
-          # For apache: files start with "httpd" instead of "apache"
-          filename_prefix = 'httpd' if module_name == 'apache' else module_name
+          # Use module name directly as the filename prefix
+          filename_prefix = module_name
+          
+          print(f"Looking for .7z files with prefix: {filename_prefix}")
+          print(f"Available assets:")
+          for asset in release_data.get('assets', []):
+              print(f"  - {asset['name']}")
           
           for asset in release_data.get('assets', []):
               filename = asset['name']
@@ -117,12 +121,12 @@ jobs:
               if filename.endswith('.7z'):
                   download_url = asset['browser_download_url']
 
-                  # Extract version number after filename prefix (e.g., "bearsampp-httpd-2.4.62-2025.7.2.7z" -> "2.4.62")
+                  # Extract version number after filename prefix (e.g., "bearsampp-apache-2.4.66-2025.12.8.7z" -> "2.4.66")
                   # Pattern: filename_prefix followed by version, then either a dash+date or .7z
                   # Supports: 18.1, 17.2.3, 3.2.1.0, 17.0-RC1, 2.4.62
-                  # The (?=-\d{4}\.|\.7z) ensures we stop before a date pattern or .7z extension
+                  # The lookahead ensures we stop before a date pattern or .7z extension
                   version_match = re.search(
-                      rf'{filename_prefix}-(\d+\.\d+(?:\.\d+)?(?:\.\d+)?(?:-(?:RC|beta|alpha|dev)\d*)?)(?=-\d{{4}}\.|-\d{{4}}\d{{2}}\.|\.\d+z|$)',
+                      rf'{filename_prefix}-(\d+\.\d+(?:\.\d+)?(?:\.\d+)?(?:-(?:RC|beta|alpha|dev)\d*)?)(?=-\d{{4}}\.\d{{1,2}}\.\d{{1,2}}|\.\d+z|$)',
                       filename,
                       re.IGNORECASE
                   )
@@ -136,6 +140,9 @@ jobs:
                       print(f"Found: {filename} -> Version: {ver}")
                   else:
                       print(f"Warning: Could not extract version from: {filename}")
+                      # Debug: print the filename for troubleshooting
+                      print(f"  Filename: {filename}")
+                      print(f"  Looking for prefix: {filename_prefix}")
 
           if not assets:
               print(f"No .7z assets found in release")
@@ -174,10 +181,10 @@ jobs:
           fixed_properties = OrderedDict()
           for key, url in properties.items():
               # Try to extract the correct version from the URL
-              # URL format: .../bearsampp-httpd-2.4.62-2025.7.2.7z (for apache)
-              # URL format: .../bearsampp-postgresql-18.1-2025.7.2.7z (for other modules)
+              # URL format: .../bearsampp-apache-2.4.66-2025.12.8.7z (for apache)
+              # URL format: .../bearsampp-postgresql-18.1-2025.12.8.7z (for other modules)
               url_version_match = re.search(
-                  rf'{filename_prefix}-(\d+\.\d+(?:\.\d+)?(?:\.\d+)?(?:-(?:RC|beta|alpha|dev)\d*)?)(?=-\d{{4}}\.|-\d{{4}}\d{{2}}\.|\.\d+z|/|$)',
+                  rf'{filename_prefix}-(\d+\.\d+(?:\.\d+)?(?:\.\d+)?(?:-(?:RC|beta|alpha|dev)\d*)?)(?=-\d{{4}}\.\d{{1,2}}\.\d{{1,2}}|\.\d+z|/|$)',
                   url,
                   re.IGNORECASE
               )