From ed08b194e5814276aa9e363a1773dc694f2b8752 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Sun, 10 Mar 2024 12:45:49 +0000 Subject: [PATCH] New release workflow --- .github/workflow_data/devbuild.py | 2 +- .github/workflow_data/release.md | 4 +-- .github/workflow_data/release.py | 21 ++++++++---- .github/workflow_data/webhook.py | 53 ++++++------------------------- .github/workflows/reindex.yml | 27 ---------------- .github/workflows/release.yml | 47 +++++++++++++++++++++++++++ .github/workflows/webhook.yml | 3 -- 7 files changed, 73 insertions(+), 84 deletions(-) delete mode 100644 .github/workflows/reindex.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflow_data/devbuild.py b/.github/workflow_data/devbuild.py index a3c05f9545..d0660866b1 100644 --- a/.github/workflow_data/devbuild.py +++ b/.github/workflow_data/devbuild.py @@ -22,7 +22,7 @@ "title": "New Devbuild!", "description": "", "url": "", - "color": 11761899, + "color": 16751147, "fields": [ { "name": "Changes since last commit:", diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md index 8402dd1083..8a33c3aca7 100644 --- a/.github/workflow_data/release.md +++ b/.github/workflow_data/release.md @@ -1,9 +1,9 @@ ## ⬇️ Download >### [🖥️ Web Updater (chrome)](https://momentum-fw.dev/update) [recommended] ->### [🐬 qFlipper Package (.tgz)](https://github.com/Next-Flip/Momentum-Firmware/releases/download/{VERSION_TAG}/{ARTIFACT_TGZ}) +>### [🐬 qFlipper Package (.tgz)](https://github.com/Next-Flip/Momentum-Firmware/releases/download/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz) ->### [📦 Zipped Archive (.zip)](https://github.com/Next-Flip/Momentum-Firmware/releases/download/{VERSION_TAG}/{ARTIFACT_ZIP}) +>### [📦 Zipped Archive (.zip)](https://github.com/Next-Flip/Momentum-Firmware/releases/download/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.zip) **Check the [install guide](https://github.com/Next-Flip/Momentum-Firmware#install) if you're not sure, or [join our Discord](https://discord.gg/momentum) if you have questions or encounter issues!** diff --git a/.github/workflow_data/release.py b/.github/workflow_data/release.py index 77f2363889..6c7b0fc764 100644 --- a/.github/workflow_data/release.py +++ b/.github/workflow_data/release.py @@ -1,20 +1,27 @@ #!/usr/bin/env python +import requests import json import os if __name__ == "__main__": + with open(os.environ["GITHUB_EVENT_PATH"], "r") as f: + event = json.load(f) + release = requests.get( + event["release"]["url"], + headers={ + "Accept": "application/vnd.github.v3+json", + "Authorization": f"token {os.environ['GITHUB_TOKEN']}" + } + ).json() + version_tag = release["tag_name"] + changelog = release["body"] + notes_path = '.github/workflow_data/release.md' - with open(os.environ['GITHUB_EVENT_PATH'], "r") as f: - changelog = json.load(f)['pull_request']['body'] with open(notes_path, "r") as f: template = f.read() notes = template.format( - ARTIFACT_TGZ=os.environ['ARTIFACT_TGZ'], - ARTIFACT_ZIP=os.environ['ARTIFACT_ZIP'], - VERSION_TAG=os.environ['VERSION_TAG'], + VERSION_TAG=version_tag, CHANGELOG=changelog ) with open(notes_path, "w") as f: f.write(notes) - with open(os.environ["ARTIFACT_TGZ"].removesuffix(".tgz") + ".md", "w") as f: - f.write(changelog.strip() + "\n\n") diff --git a/.github/workflow_data/webhook.py b/.github/workflow_data/webhook.py index b9a03a0359..1f1531e116 100644 --- a/.github/workflow_data/webhook.py +++ b/.github/workflow_data/webhook.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +import datetime as dt import requests import json import sys @@ -44,50 +45,13 @@ color = 16723712 if event["forced"] else 3669797 case "release": - match event["action"]: - case "published": - webhook = "RELEASE_WEBHOOK" - color = 13845998 - title = f"New Release published: {event['name']}" - desc += f"Changelog:" - - changelog = "".join( - event["body"] - .split("Changelog")[1] - .split("