Merge pull request #84 from MikroElektronika/fix/release-to-latest

Fix/release to latest

Author: StrahinjaJacimovic

.github/workflows/boardCardReleaseLive.yaml

@@ -70,7 +70,7 @@ jobs:
       - name: Update Changelogs
         id: changelog_update
         run: |
-          python -u scripts/update_board_changelog.py
+          python -u scripts/update_board_changelog.py ${{ secrets.GITHUB_TOKEN }} ${{ github.repository }}
           sdk_tag=$(<sdk_tag.txt)
           rm sdk_tag.txt
           echo "SDK Tag name is mikroSDK-$sdk_tag"

.github/workflows/boardCardReleaseTest.yaml

@@ -73,7 +73,7 @@ jobs:
       - name: Update Changelogs
         id: changelog_update
         run: |
-          python -u scripts/update_board_changelog.py
+          python -u scripts/update_board_changelog.py ${{ secrets.GITHUB_TOKEN }} ${{ github.repository }}
           sdk_tag=$(<sdk_tag.txt)
           rm sdk_tag.txt
           echo "SDK Tag name is mikroSDK-$sdk_tag"

scripts/index.py

@@ -200,6 +200,7 @@ def index_release_to_elasticsearch(es : Elasticsearch, index_name, release_detai
     ## 0 is new one being indexed, 1 in previously indexed release
     if 'mikrosdk' in metadata_content[0]:
         version = metadata_content[0]['mikrosdk']['version']
+        version_index = check_from_index_version(es, index_name, 'mikrosdk')
     else:
         for asset in release_details[0].get('assets', []):
             if 'mikrosdk.7z' == asset['name']:
@@ -212,6 +213,7 @@ def index_release_to_elasticsearch(es : Elasticsearch, index_name, release_detai
 
                 # Then fetch version from manifest file
                 version = support.fetch_version_from_asset(os.path.join(os.path.dirname(__file__), 'tmp'))
+                version_index = check_from_index_version(es, index_name, 'mikrosdk')
                 break
 
     import urllib.request
@@ -270,7 +272,7 @@ def index_release_to_elasticsearch(es : Elasticsearch, index_name, release_detai
                     'category': 'Software Development Kit',
                     'download_link': asset['url'],  # Adjust as needed for actual URL
                     "install_location" : "%APPLICATION_DATA_DIR%/packages/sdk",
-                    'package_changed': version != version
+                    'package_changed': version != version_index
                 }
             elif 'templates' == name_without_extension:
                 package_changed = True

scripts/update_board_changelog.py

@@ -1,7 +1,21 @@
-import os
+import os, requests, argparse
+import support as support
+
 from datetime import datetime
 from packaging.version import Version
 
+# Gets latest release headers from repository
+def get_headers(api, token):
+    if api:
+        return {
+            'Authorization': f'token {token}'
+        }
+    else:
+        return {
+            'Authorization': f'Bearer {token}',
+            'Accept': 'application/octet-stream'
+        }
+
 def write_output_to_file(file, content):
     with open(file, 'w') as file_write:
         file_write.write(content)
@@ -13,21 +27,43 @@ def find_file(root_folder, filename):
             return os.path.join(dirpath, filename), dirpath
     return None, None
 
-found_file, file_dir = find_file(os.path.join(os.getcwd(), "changelog"), "new_hw.md")
-
-if found_file:
-    current_date = datetime.now().strftime("%Y-%m-%d")
-    os.rename(found_file, os.path.join(file_dir, f'{current_date}.md'))
-    with open(os.path.join(file_dir, f'{current_date}.md'), 'r') as hw_changelog_file:
-        board_changelog = hw_changelog_file.read()
-    hw_changelog_file.close()
-    board_changelog = board_changelog.replace('`DATE`', current_date).replace('#date', f'#{current_date}')
-    with open(os.path.join(file_dir, f'{current_date}.md'), 'w') as hw_changelog_file:
-        hw_changelog_file.write(board_changelog)
-    hw_changelog_file.close()
-
-    write_output_to_file(os.path.join(os.getcwd(), 'sdk_tag.txt'), file_dir.split(os.path.sep)[-2][1:])
-else:
-    # Extract and sort versions, removing the 'v' prefix
-    latest_version = max(os.listdir(os.path.join(os.getcwd(), 'changelog')), key=lambda v: Version(v.lstrip('v'))).lstrip('v')
-    write_output_to_file(os.path.join(os.getcwd(), 'sdk_tag.txt'), latest_version)
+def fetch_latest_release_version(repo, token):
+    api_headers = get_headers(True, token)
+    url = f'https://api.github.com/repos/{repo}/releases'
+    response = requests.get(url, headers=api_headers)
+    response.raise_for_status()  # Raise an exception for HTTP errors
+    return support.get_latest_release(response.json())
+
+def edit_changelog(version):
+    found_file, file_dir = find_file(os.path.join(os.getcwd(), "changelog"), "new_hw.md")
+
+    if found_file:
+        current_date = datetime.now().strftime("%Y-%m-%d")
+        os.rename(found_file, os.path.join(file_dir, f'{current_date}.md'))
+        with open(os.path.join(file_dir, f'{current_date}.md'), 'r') as hw_changelog_file:
+            board_changelog = hw_changelog_file.read()
+        hw_changelog_file.close()
+        board_changelog = board_changelog.replace('`DATE`', current_date).replace('#date', f'#{current_date}')
+        with open(os.path.join(file_dir, f'{current_date}.md'), 'w') as hw_changelog_file:
+            hw_changelog_file.write(board_changelog)
+        hw_changelog_file.close()
+
+        os.makedirs(os.path.join(file_dir, f'v{version}', 'new_hw'), exist_ok=True)
+        os.rename(os.path.join(file_dir, f'{current_date}.md'), os.path.join(file_dir, f'v{version}', f'new_hw/{current_date}.md'))
+
+        write_output_to_file(os.path.join(os.getcwd(), 'sdk_tag.txt'), version)
+    else:
+        # Extract and sort versions, removing the 'v' prefix
+        # Take the ighest version present in the repo itself, not github
+        latest_version = max(os.listdir(os.path.join(os.getcwd(), 'changelog')), key=lambda v: Version(v.lstrip('v'))).lstrip('v')
+        write_output_to_file(os.path.join(os.getcwd(), 'sdk_tag.txt'), latest_version)
+
+if __name__ == '__main__':
+    # Get arguments
+    parser = argparse.ArgumentParser(description="Upload directories as release assets.")
+    parser.add_argument("token", type=str, help="GitHub Token")
+    parser.add_argument("repo", type=str, help="Repository name, e.g., 'username/repo'")
+    args = parser.parse_args()
+
+    release = fetch_latest_release_version(args.repo, args.token)
+    edit_changelog(release['tag_name'].replace('mikroSDK-', ''))