Update prebuilt objects [skip actions]

.github/workflows/BuildTest.yml

@@ -10,12 +10,17 @@ on:
             description: 'Force a Release build. When not forced, the system will check for release word in the last commit message to trigger a release'
             required: true
             type: boolean
+          update_installer:
+            description: 'Skip the build and only update the web installer'
+            required: true
+            type: boolean            
   # push:
   #   branches: 
   #     - '**4.3'
 
 jobs:
   bootstrap:
+    if: ${{ inputs.update_installer != true }}
     name: Global setup
     runs-on: ubuntu-latest
     container:
@@ -98,6 +103,7 @@ jobs:
           components/wifi-manager/webapp/dist/*
           components/wifi-manager/webapp/*.cmake 
   build:
+    if: ${{ inputs.update_installer != true }}
     runs-on: ubuntu-latest
     container:
       image: sle118/squeezelite-esp32-idfv43
@@ -191,16 +197,6 @@ jobs:
           build/bootloader/bootloader.bin 
           build/partition_table/partition-table.bin
           build_output.zip
-    - name: Save Last Build Parameters
-      if: ${{ needs.bootstrap.outputs.mock == 0 }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: build_parms
-        path: |
-          build/flash_project_args 
-          build/flasher_args.json
-          partitions.csv
-          sdkconfig
     - name: Create Release
       if: ${{ needs.bootstrap.outputs.release_flag == 1 && needs.bootstrap.outputs.mock == 0 }}
       id: create_release
@@ -236,9 +232,10 @@ jobs:
         asset_name: ${{ env.artifact_file_name }}
         asset_content_type: application/octet-stream          
   update_web_installer:
-    name: Web Installer
+    name: Update Web Installer After Release
-    if: ${{ needs.bootstrap.outputs.release_flag == 1 && needs.bootstrap.outputs.mock == 0 }}
+    if: ${{ ( always() && !cancelled() ) && ( ( inputs.update_installer == true ) ||  needs.bootstrap.outputs.release_flag == 1 && needs.bootstrap.outputs.mock == 0  ) }}
-    needs: [build, bootstrap]
+    env:
+      WEB_INSTALLER: ${{ secrets.WEB_INSTALLER }}
     runs-on: ubuntu-latest
     container:
       image: sle118/squeezelite-esp32-idfv43
@@ -247,13 +244,9 @@ jobs:
         with:
           fetch-depth: 0
           submodules: true    
-      - uses: actions/download-artifact@master
-        name: Restore last build
-        with:
-          name: build_parms
       - name: Update Web Installer Project
         run: |
           . /opt/esp/python_env/idf4.3_py3.8_env/bin/activate
           git config --global --add safe.directory /__w/squeezelite-esp32/squeezelite-esp32   
-          build_tools.py manifest --flash_file "./build/flasher_args.json" --outdir "./bin_files" --manif_name "manifest" --max_count 3
+          build_tools.py manifest --flash_file "/build/flash_project_args" --outdir "./bin_files" --manif_name "manifest" --max_count 3
-          build_tools.py pushinstaller --source "./bin_files" --manif_name "manifest" --target "web-installer" --url "https://github.com/sle118/squeezelite-esp32-installer.git" --artifacts "artifacts" --web_installer_branch "main" --token "${{secrets.github_token}}"
+          build_tools.py pushinstaller --source "./bin_files" --manif_name "manifest" --target "web-installer" --url "https://github.com/sle118/squeezelite-esp32-installer.git" --artifacts "artifacts" --web_installer_branch "main" --token "${{env.WEB_INSTALLER}}"

Dockerfile

@@ -110,17 +110,8 @@ ENV OPENOCD_SCRIPTS="/opt/esp/tools/openocd-esp32/v0.10.0-esp32-20211111/openocd
 
 ENV IDF_CCACHE_ENABLE=1
 COPY docker/entrypoint.sh /opt/esp/entrypoint.sh
-COPY ./docker/build_tools.py /usr/sbin/build_tools.py
 COPY components/wifi-manager/webapp/package.json /opt
 
-
-RUN : \
-  && echo Changing permissions ********************************************************  \
-  && chmod +x /opt/esp/entrypoint.sh \
-  && chmod +x /usr/sbin/build_tools.py \  
-  && :
-
-
 ENV NODE_VERSION 8
 
 SHELL ["/bin/bash", "--login", "-c"]
@@ -153,7 +144,12 @@ RUN : \
 
 ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
 ENV PATH $IDF_PYTHON_ENV_PATH:$NVM_DIR/v$NODE_VERSION/bin:$PATH
-
+COPY ./docker/build_tools.py /usr/sbin/build_tools.py
+RUN : \
+  && echo Changing permissions ********************************************************  \
+  && chmod +x /opt/esp/entrypoint.sh \
+  && chmod +x /usr/sbin/build_tools.py \  
+  && :
 
 ENTRYPOINT [ "/opt/esp/entrypoint.sh" ]
 CMD [ "/bin/bash" ]

components/wifi-manager/webapp/dist/src/js/test.d.ts

@@ -9,6 +9,7 @@ declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
+declare function getStatus(): {};
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
@@ -20,6 +21,8 @@ declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
+declare function getRadioButton(entry: any): string;
+declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;

components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
 target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.d7aa75121c64674ca146.css.gz BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/favicon-32x32.png BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/index.html.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.b01f1b.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.d10a2c.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.b01f1b.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.d10a2c.bundle.js.gz BINARY)

components/wifi-manager/webapp/webpack.c

@@ -6,29 +6,29 @@ extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_s
 extern const uint8_t _favicon_32x32_png_end[] asm("_binary_favicon_32x32_png_end");
 extern const uint8_t _index_html_gz_start[] asm("_binary_index_html_gz_start");
 extern const uint8_t _index_html_gz_end[] asm("_binary_index_html_gz_end");
-extern const uint8_t _index_b01f1b_bundle_js_gz_start[] asm("_binary_index_b01f1b_bundle_js_gz_start");
+extern const uint8_t _index_d10a2c_bundle_js_gz_start[] asm("_binary_index_d10a2c_bundle_js_gz_start");
-extern const uint8_t _index_b01f1b_bundle_js_gz_end[] asm("_binary_index_b01f1b_bundle_js_gz_end");
+extern const uint8_t _index_d10a2c_bundle_js_gz_end[] asm("_binary_index_d10a2c_bundle_js_gz_end");
-extern const uint8_t _node_vendors_b01f1b_bundle_js_gz_start[] asm("_binary_node_vendors_b01f1b_bundle_js_gz_start");
+extern const uint8_t _node_vendors_d10a2c_bundle_js_gz_start[] asm("_binary_node_vendors_d10a2c_bundle_js_gz_start");
-extern const uint8_t _node_vendors_b01f1b_bundle_js_gz_end[] asm("_binary_node_vendors_b01f1b_bundle_js_gz_end");
+extern const uint8_t _node_vendors_d10a2c_bundle_js_gz_end[] asm("_binary_node_vendors_d10a2c_bundle_js_gz_end");
 const char * resource_lookups[] = {
 	"/css/index.d7aa75121c64674ca146.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.b01f1b.bundle.js.gz",
+	"/js/index.d10a2c.bundle.js.gz",
-	"/js/node_vendors.b01f1b.bundle.js.gz",
+	"/js/node_vendors.d10a2c.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
 	_index_d7aa75121c64674ca146_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_b01f1b_bundle_js_gz_start,
+	_index_d10a2c_bundle_js_gz_start,
-	_node_vendors_b01f1b_bundle_js_gz_start
+	_node_vendors_d10a2c_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
 	_index_d7aa75121c64674ca146_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_b01f1b_bundle_js_gz_end,
+	_index_d10a2c_bundle_js_gz_end,
-	_node_vendors_b01f1b_bundle_js_gz_end
+	_node_vendors_d10a2c_bundle_js_gz_end
 };

components/wifi-manager/webapp/webpack.h

@@ -1,6 +1,6 @@
 /***********************************
 webpack_headers
-dist/css/index.d7aa75121c64674ca146.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.b01f1b.bundle.js.gz,dist/js/node_vendors.b01f1b.bundle.js.gz
+dist/css/index.d7aa75121c64674ca146.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.d10a2c.bundle.js.gz,dist/js/node_vendors.d10a2c.bundle.js.gz
 ***********************************/
 #pragma once
 #include <inttypes.h>