From fb9c594c61a625f4d07740d356b8b96d3ba6437a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Schr=C3=B6ter?= <487046+jschroeter@users.noreply.github.com> Date: Sat, 22 Jun 2024 01:08:40 +0200 Subject: [PATCH] CI: push firmware to website repo #2 --- .github/workflows/firmware.yml | 1 + firmware/esp32/gdoor/merge_firmware.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index 071fef1..c006a47 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -51,6 +51,7 @@ jobs: with: source-directory: './firmware/esp32/gdoor/.pio/build/GDOOR_ESP32MINI/web' target-directory: 'assets/firmware' + destination-github-username: 'gdoor-org' destination-repository-name: 'gdoor-org.github.io' target-branch: main user-name: 'github-actions[bot]' diff --git a/firmware/esp32/gdoor/merge_firmware.py b/firmware/esp32/gdoor/merge_firmware.py index 570ed97..c50fdda 100644 --- a/firmware/esp32/gdoor/merge_firmware.py +++ b/firmware/esp32/gdoor/merge_firmware.py @@ -39,7 +39,7 @@ def merge_bin(source, target, env): # build web flasher manifest with open(MANIFEST_JSON, 'r', encoding='utf-8') as json_file: manifest = json.load(json_file) - manifest["version"] = env.get("GDOOR_VERSION", "dev") + manifest["version"] = os.environ.get("GDOOR_VERSION", "dev") with open(MANIFEST_JSON_RESULT, 'w', encoding='utf-8') as json_file: json.dump(manifest, json_file)