Browse Source

Merge branch 'master-v4.3' of https://github.com/sle118/squeezelite-esp32 into master-v4.3

philippe44 2 years ago
parent
commit
ce4cebd994

+ 3 - 2
.github/workflows/Platform_build.yml

@@ -13,7 +13,6 @@ 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
-
 jobs:
   bootstrap:
     name: Global setup
@@ -228,5 +227,7 @@ jobs:
   update_web_installer:
     name: Update Web Installer After Release
     needs: [ bootstrap, build ]
-    if:  ${{( always() && !cancelled() ) && needs.bootstrap.outputs.release_flag == 1 && needs.bootstrap.outputs.mock == 0 }}
+    if: ${{ always() && !cancelled() && needs.bootstrap.outputs.release_flag == 1 && needs.bootstrap.outputs.mock == 0 }}
     uses: ./.github/workflows/web_deploy.yml
+    secrets:
+      WEB_INSTALLER: ${{ secrets.WEB_INSTALLER }}

+ 3 - 0
.github/workflows/web_deploy.yml

@@ -1,6 +1,9 @@
 name: Update Web Installer
 on:
   workflow_call:
+    secrets:
+      WEB_INSTALLER:
+        required: true       
   workflow_dispatch:
 jobs:
   update_web_installer:

+ 0 - 0
components/wifi-manager/webapp/dist/dist/js/index.ab1d13.bundle.d.ts → components/wifi-manager/webapp/dist/dist/js/index.0748ab.bundle.d.ts


+ 0 - 0
components/wifi-manager/webapp/dist/dist/js/node_vendors.ab1d13.bundle.d.ts → components/wifi-manager/webapp/dist/dist/js/node_vendors.0748ab.bundle.d.ts


File diff suppressed because it is too large
+ 0 - 0
components/wifi-manager/webapp/dist/index.html


BIN
components/wifi-manager/webapp/dist/index.html.gz


File diff suppressed because it is too large
+ 0 - 0
components/wifi-manager/webapp/dist/js/index.b79c88.bundle.js


BIN
components/wifi-manager/webapp/dist/js/index.3a56a6.bundle.js.gz → components/wifi-manager/webapp/dist/js/index.b79c88.bundle.js.gz


File diff suppressed because it is too large
+ 0 - 0
components/wifi-manager/webapp/dist/js/index.b79c88.bundle.js.map


File diff suppressed because it is too large
+ 0 - 0
components/wifi-manager/webapp/dist/js/node_vendors.b79c88.bundle.js


BIN
components/wifi-manager/webapp/dist/js/node_vendors.3a56a6.bundle.js.gz → components/wifi-manager/webapp/dist/js/node_vendors.b79c88.bundle.js.gz


File diff suppressed because it is too large
+ 0 - 0
components/wifi-manager/webapp/dist/js/node_vendors.b79c88.bundle.js.map


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

@@ -41,6 +41,9 @@ declare function getStatus(): {};
 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;
 declare function getRadioButton(entry: any): string;
@@ -84,6 +87,9 @@ 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;
 declare function pushStatus(): void;

+ 2 - 2
components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
 target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.cd56ff129e3113d8cd3a.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.3a56a6.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.3a56a6.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.b79c88.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.b79c88.bundle.js.gz BINARY)

+ 10 - 10
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_3a56a6_bundle_js_gz_start[] asm("_binary_index_3a56a6_bundle_js_gz_start");
-extern const uint8_t _index_3a56a6_bundle_js_gz_end[] asm("_binary_index_3a56a6_bundle_js_gz_end");
-extern const uint8_t _node_vendors_3a56a6_bundle_js_gz_start[] asm("_binary_node_vendors_3a56a6_bundle_js_gz_start");
-extern const uint8_t _node_vendors_3a56a6_bundle_js_gz_end[] asm("_binary_node_vendors_3a56a6_bundle_js_gz_end");
+extern const uint8_t _index_b79c88_bundle_js_gz_start[] asm("_binary_index_b79c88_bundle_js_gz_start");
+extern const uint8_t _index_b79c88_bundle_js_gz_end[] asm("_binary_index_b79c88_bundle_js_gz_end");
+extern const uint8_t _node_vendors_b79c88_bundle_js_gz_start[] asm("_binary_node_vendors_b79c88_bundle_js_gz_start");
+extern const uint8_t _node_vendors_b79c88_bundle_js_gz_end[] asm("_binary_node_vendors_b79c88_bundle_js_gz_end");
 const char * resource_lookups[] = {
 	"/css/index.cd56ff129e3113d8cd3a.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.3a56a6.bundle.js.gz",
-	"/js/node_vendors.3a56a6.bundle.js.gz",
+	"/js/index.b79c88.bundle.js.gz",
+	"/js/node_vendors.b79c88.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
 	_index_cd56ff129e3113d8cd3a_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_3a56a6_bundle_js_gz_start,
-	_node_vendors_3a56a6_bundle_js_gz_start
+	_index_b79c88_bundle_js_gz_start,
+	_node_vendors_b79c88_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
 	_index_cd56ff129e3113d8cd3a_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_3a56a6_bundle_js_gz_end,
-	_node_vendors_3a56a6_bundle_js_gz_end
+	_index_b79c88_bundle_js_gz_end,
+	_node_vendors_b79c88_bundle_js_gz_end
 };

+ 1 - 1
components/wifi-manager/webapp/webpack.h

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

BIN
server_certs/DigiCertGlobalRootCA.crt.31


BIN
server_certs/DigiCertGlobalRootCA.crt.32


BIN
server_certs/r2m01.cer.3


BIN
server_certs/r2m01.cer.4


Some files were not shown because too many files changed in this diff