andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-30 10:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2867 from proddy/dev

Browse Source 
last minute 3.8 cleanup
This commit is contained in:
Proddy
2025-12-31 09:25:51 +01:00
committed by GitHub
parent 27848feddd 55778ba0b5
commit 3ea88a2be0
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/package.json
View File

@@ -67,5 +67,5 @@
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^6.0.3" "vite-tsconfig-paths": "^6.0.3"
}, },
"packageManager": "pnpm@10.26.2+sha512.0e308ff2005fc7410366f154f625f6631ab2b16b1d2e70238444dd6ae9d630a8482d92a451144debc492416896ed16f7b114a86ec68b8404b2443869e68ffda6" "packageManager": "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a"
} }

2
mock-api/package.json
View File

@@ -15,5 +15,5 @@
"itty-router": "^5.0.22", "itty-router": "^5.0.22",
"prettier": "^3.7.4" "prettier": "^3.7.4"
}, },
"packageManager": "pnpm@10.26.2+sha512.0e308ff2005fc7410366f154f625f6631ab2b16b1d2e70238444dd6ae9d630a8482d92a451144debc492416896ed16f7b114a86ec68b8404b2443869e68ffda6" "packageManager": "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a"
} }

10
mock-api/restServer.ts
View File

@@ -116,13 +116,13 @@ let system_status = {
}, },
{ {
partition: 'app1', partition: 'app1',
version: '3.7.3-dev.40', version: '3.8.1-dev.40',
install_date: '2025-03-01T13:29:13.999Z', install_date: '2025-03-01T13:29:13.999Z',
size: 4672 size: 4672
}, },
{ {
partition: 'factory', partition: 'factory',
version: '3.7.3-dev.39', version: '3.8.1-dev.39',
install_date: '2025-03-01T13:29:13.999Z', install_date: '2025-03-01T13:29:13.999Z',
size: 4672 size: 4672
} }
@@ -165,19 +165,19 @@ switch (version_test as number) {
break; break;
case 2: case 2:
// upgrade an older stable to latest stable or switch to latest dev // upgrade an older stable to latest stable or switch to latest dev
THIS_VERSION = '3.7.2'; THIS_VERSION = '3.8.0';
STABLE_VERSION_IS_UPGRADEABLE = true; STABLE_VERSION_IS_UPGRADEABLE = true;
DEV_VERSION_IS_UPGRADEABLE = true; DEV_VERSION_IS_UPGRADEABLE = true;
break; break;
case 3: case 3:
// upgrade dev to latest, or switch to stable // upgrade dev to latest, or switch to stable
THIS_VERSION = '3.8.0-dev.3'; THIS_VERSION = '3.8.1-dev.3';
STABLE_VERSION_IS_UPGRADEABLE = false; STABLE_VERSION_IS_UPGRADEABLE = false;
DEV_VERSION_IS_UPGRADEABLE = true; DEV_VERSION_IS_UPGRADEABLE = true;
break; break;
case 4: case 4:
// downgrade to an older dev, or switch back to stable // downgrade to an older dev, or switch back to stable
THIS_VERSION = '3.8.0-dev.1'; THIS_VERSION = '3.8.1-dev.1';
STABLE_VERSION_IS_UPGRADEABLE = true; STABLE_VERSION_IS_UPGRADEABLE = true;
DEV_VERSION_IS_UPGRADEABLE = false; DEV_VERSION_IS_UPGRADEABLE = false;
break; break;

4
src/test/test.cpp
View File

@@ -1333,8 +1333,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
// use same data as in restServer.ts // use same data as in restServer.ts
// log shows first if you can upgrade to dev, and then if you can upgrade to stable // log shows first if you can upgrade to dev, and then if you can upgrade to stable
// request.url("/rest/action"); // request.url("/rest/action");
// std::string LATEST_STABLE_VERSION = "3.7.2"; // std::string LATEST_STABLE_VERSION = "3.8.0";
// std::string LATEST_DEV_VERSION = "3.8.0-dev.3"; // std::string LATEST_DEV_VERSION = "3.8.1-dev.3";
// std::string param = LATEST_DEV_VERSION + "," + LATEST_STABLE_VERSION; // std::string param = LATEST_DEV_VERSION + "," + LATEST_STABLE_VERSION;
// std::string action = "{\"action\":\"checkUpgrade\", \"param\":\"" + param + "\"}"; // std::string action = "{\"action\":\"checkUpgrade\", \"param\":\"" + param + "\"}";
// deserializeJson(doc, action); // deserializeJson(doc, action);