Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add webapp autocompile #1193

Merged
merged 16 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
platformio-device-monitor*.log
logs/device-monitor*.log
platformio_override.ini
webapp_dist/
.DS_Store
65 changes: 65 additions & 0 deletions pio-scripts/compile_webapp.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import os
import hashlib
import pickle
import subprocess

def check_files(directories, filepaths, hash_file):
old_file_hashes = {}
file_hashes = {}

for directory in directories:
for root, dirs, filenames in os.walk(directory):
for file in filenames:
filepaths.append(os.path.join(root, file))

for file_path in filepaths:
with open(file_path, 'rb') as f:
file_data = f.read()
file_hashes[file_path] = hashlib.md5(file_data).hexdigest()

if os.path.exists(hash_file):
with open(hash_file, 'rb') as f:
old_file_hashes = pickle.load(f)

update = False
for file_path, file_hash in file_hashes.items():
if file_path not in old_file_hashes or old_file_hashes[file_path] != file_hash:
update = True
break

if not update:
print("webapp artifacts should be up-to-date")
return

print("compiling webapp (hang on, this can take a while and there might be little output)...")

try:
# if these commands fail, an exception will prevent us from
# persisting the current hashes => commands will be executed again
subprocess.run(["yarn", "--cwd", "webapp", "install", "--frozen-lockfile"],
check=True)

subprocess.run(["yarn", "--cwd", "webapp", "build"], check=True)

except FileNotFoundError:
raise Exception("it seems 'yarn' is not installed/available on your system")

with open(hash_file, 'wb') as f:
pickle.dump(file_hashes, f)

def main():
if os.getenv('GITHUB_ACTIONS') == 'true':
print("INFO: not testing for up-to-date webapp artifacts when running as Github action")
return 0

print("INFO: testing for up-to-date webapp artifacts")

directories = ["webapp/src/", "webapp/public/"]
files = ["webapp/index.html", "webapp/tsconfig.config.json",
"webapp/tsconfig.json", "webapp/vite.config.ts",
"webapp/yarn.lock"]
hash_file = "webapp_dist/.hashes.pkl"

check_files(directories, files, hash_file)

main()
1 change: 1 addition & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ lib_deps =
plerup/EspSoftwareSerial @ ^8.2.0

extra_scripts =
pre:pio-scripts/compile_webapp.py
pre:pio-scripts/auto_firmware_version.py
pre:pio-scripts/patch_apply.py
post:pio-scripts/create_factory_bin.py
Expand Down
Binary file removed webapp_dist/favicon.ico
Binary file not shown.
Binary file removed webapp_dist/favicon.png
Binary file not shown.
Binary file removed webapp_dist/index.html.gz
Binary file not shown.
Binary file removed webapp_dist/js/app.js.gz
Binary file not shown.
13 changes: 0 additions & 13 deletions webapp_dist/site.webmanifest

This file was deleted.

Binary file removed webapp_dist/zones.json.gz
Binary file not shown.
Loading