CI: push firmware to website repo #2

gdoor-org · Jun 21, 2024 · fb9c594 · fb9c594
1 parent 754614f
commit fb9c594
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)