diff --git a/.github/workflows/dev_release.yml b/.github/workflows/dev_release.yml index 3c3dcf7ea..e68ac55b4 100644 --- a/.github/workflows/dev_release.yml +++ b/.github/workflows/dev_release.yml @@ -47,7 +47,7 @@ jobs: - name: Build webUI run: | - platformio run -e build_webUI + platformio run -e build-webUI - name: Build modbus run: | diff --git a/.github/workflows/stable_release.yml b/.github/workflows/stable_release.yml index 76fb12038..6286e6ea3 100644 --- a/.github/workflows/stable_release.yml +++ b/.github/workflows/stable_release.yml @@ -39,7 +39,7 @@ jobs: - name: Build webUI run: | - platformio run -e build_webUI + platformio run -e build-webUI - name: Build modbus run: | diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index a9da6a564..3fb4ce3fc 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -47,7 +47,7 @@ jobs: - name: Build webUI run: | - platformio run -e build_webUI + platformio run -e build-webUI - name: Build modbus run: | diff --git a/interface/package.json b/interface/package.json index 5fd86c743..ffa98cfbc 100644 --- a/interface/package.json +++ b/interface/package.json @@ -17,7 +17,7 @@ "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"pnpm:mock-rest\" \"vite preview\"", "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite dev\"", "typesafe-i18n": "typesafe-i18n --no-watch", - "build_webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js", + "build-webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js", "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'", "lint": "eslint . --fix", "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\"" diff --git a/pio_local.ini_example b/pio_local.ini_example index 5b976e0f8..29a40d240 100644 --- a/pio_local.ini_example +++ b/pio_local.ini_example @@ -20,7 +20,7 @@ my_build_flags = [platformio] default_envs = s_16M_P ; BBQKees E32V2 -; default_envs = build_webUI ; build the web interface only +; default_envs = build-webUI ; build the web interface only ; default_envs = s3_16M_P ; BBQKees S3 ; default_envs = s_4M ; BBQKees older S32, 4MB no psram ; default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram diff --git a/platformio.ini b/platformio.ini index c649d5e8d..c94e1383f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -109,7 +109,7 @@ lib_deps = ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8 ; builds the web interface only, not the firmware -[env:build_webUI] +[env:build-webUI] platform = native targets = build extra_scripts = pre:scripts/build_interface.py diff --git a/scripts/build_interface.py b/scripts/build_interface.py index 069e8c774..b30eced2c 100755 --- a/scripts/build_interface.py +++ b/scripts/build_interface.py @@ -74,7 +74,7 @@ def buildWeb(): # Run pnpm commands in the interface directory commands = [ f"{pnpm_exe} install", - f"{pnpm_exe} build_webUI" + f"{pnpm_exe} build-webUI" ] for command in commands: @@ -102,7 +102,7 @@ def buildWeb(): return False -def build_webUI(*args, **kwargs): +def build-webUI(*args, **kwargs): success = buildWeb() if not success: print("Web interface build failed!") @@ -114,7 +114,7 @@ def build_webUI(*args, **kwargs): env.AddCustomTarget( name="build", dependencies=None, - actions=[build_webUI], + actions=[build-webUI], title="build web interface", description="installs pnpm packages, updates libraries and builds web UI", always_build=True diff --git a/scripts/update_all.sh b/scripts/update_all.sh index 31992ecd8..283e892c5 100644 --- a/scripts/update_all.sh +++ b/scripts/update_all.sh @@ -20,7 +20,7 @@ pnpm format cd .. cd interface -pnpm build_webUI +pnpm build-webUI cd .. npx cspell "**"