diff --git a/.github/workflow_data/devbuild.py b/.github/workflow_data/devbuild.py index c4b9408fb..ba30eb9ae 100644 --- a/.github/workflow_data/devbuild.py +++ b/.github/workflow_data/devbuild.py @@ -12,6 +12,20 @@ if __name__ == "__main__": with open(os.environ["GITHUB_EVENT_PATH"], "r") as f: event = json.load(f) + release = "release" + before = event["before"][:8] + after = event["after"][:8] + compare = event["compare"].rsplit("/", 1)[0] + + # Saved before uploading new devbuild + with open("previndex.json", "r") as f: + previndex = json.load(f) + for channel in previndex["channels"]: + if channel["id"] == "release": + release = channel["versions"][0]["version"] + if channel["id"] == "development": + before = channel["versions"][0]["version"] + requests.post( os.environ["BUILD_WEBHOOK"], headers={"Accept": "application/json", "Content-Type": "application/json"}, @@ -25,19 +39,23 @@ if __name__ == "__main__": "color": 16751147, "fields": [ { - "name": "Changes since last commit:", - "value": f"[Compare {event['before'][:7]} to {event['after'][:7]}]({event['compare']})" + "name": "Diff since last build:", + "value": f"[Compare {before} to {after}]({compare}/{before}...{after})" }, { - "name": "Changes since last release:", - "value": f"[Compare release to {event['after'][:7]}]({event['compare'].rsplit('/', 1)[0] + '/release...' + event['after']})" + "name": "Diff since last release:", + "value": f"[Compare {release} to {after}]({compare}/{release}...{after})" + }, + { + "name": "Changelog since last release:", + "value": f"[Changes since {release}]({event['repository']['html_url']}/blob/{after}/ChangeLog.md)" }, { "name": "Download artifacts:", "value": f"- [Download Firmware TGZ]({artifact_tgz})\n- [SDK (for development)]({artifact_sdk})" } ], - "timestamp": dt.datetime.utcnow().isoformat() + "timestamp": dt.datetime.now(dt.UTC).isoformat() } ], }, diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cacac7ff9..c4e3dfea1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,6 +97,7 @@ jobs: INDEXER_URL: ${{ secrets.INDEXER_URL }} if: ${{ env.INDEXER_URL != '' && github.event_name == 'push' && ((github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')) || startsWith(github.ref, 'refs/tags/')) }} run: | + curl "${{ secrets.INDEXER_URL }}"/firmware/directory.json > previndex.json FILES=$(for ARTIFACT in $(find artifacts -maxdepth 1 -not -type d); do echo "-F files=@${ARTIFACT}"; done) curl --fail -L -H "Token: ${{ secrets.INDEXER_TOKEN }}" \ -F "branch=${BRANCH_NAME}" \