mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 15:59:52 +03:00
fix downloading of 16M builds
This commit is contained in:
6
.github/workflows/pre_release.yml
vendored
6
.github/workflows/pre_release.yml
vendored
@@ -38,13 +38,13 @@ jobs:
|
||||
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
|
||||
yarn build
|
||||
yarn webUI
|
||||
- name: Build 4M firmware
|
||||
- name: Build ESP32 4M firmware
|
||||
run: |
|
||||
platformio run -e ci
|
||||
- name: Build S3 firmware
|
||||
- name: Build ESP32-S3 16M firmware
|
||||
run: |
|
||||
platformio run -e ci_s3
|
||||
- name: Build 16M firmware
|
||||
- name: Build ESP32 16M firmware
|
||||
run: |
|
||||
platformio run -e ci_16M
|
||||
- name: Create GitHub Release
|
||||
|
||||
7
.github/workflows/tagged_release.yml
vendored
7
.github/workflows/tagged_release.yml
vendored
@@ -35,12 +35,15 @@ jobs:
|
||||
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
|
||||
yarn build
|
||||
yarn webUI
|
||||
- name: Build 4M firmware
|
||||
- name: Build ESP32 4M firmware
|
||||
run: |
|
||||
platformio run -e ci
|
||||
- name: Build S3 firmware
|
||||
- name: Build ESP32-S3 16M firmware
|
||||
run: |
|
||||
platformio run -e ci_s3
|
||||
- name: Build ESP32 16M firmware
|
||||
run: |
|
||||
platformio run -e ci_16M
|
||||
- name: Release
|
||||
uses: 'marvinpinto/action-automatic-releases@latest'
|
||||
with:
|
||||
|
||||
14
.github/workflows/test_release.yml
vendored
14
.github/workflows/test_release.yml
vendored
@@ -10,7 +10,6 @@ jobs:
|
||||
pre-release:
|
||||
name: 'Automatic test-release build'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Enable Corepack
|
||||
@@ -22,18 +21,15 @@ jobs:
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20.x'
|
||||
|
||||
- name: Get EMS-ESP source code and version
|
||||
id: build_info
|
||||
run: |
|
||||
version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
|
||||
echo "VERSION=$version" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Install PlatformIO
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install -U platformio
|
||||
|
||||
- name: Build WebUI
|
||||
run: |
|
||||
cd interface
|
||||
@@ -42,15 +38,15 @@ jobs:
|
||||
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
|
||||
yarn build
|
||||
yarn webUI
|
||||
|
||||
- name: Build firmware
|
||||
- name: Build ESP32 4M firmware
|
||||
run: |
|
||||
platformio run -e ci
|
||||
|
||||
- name: Build S3 firmware
|
||||
- name: Build ESP32-S3 16M firmware
|
||||
run: |
|
||||
platformio run -e ci_s3
|
||||
|
||||
- name: Build ESP32 16M firmware
|
||||
run: |
|
||||
platformio run -e ci_16M
|
||||
- name: Create a GH Release
|
||||
id: 'automatic_releases'
|
||||
uses: 'marvinpinto/action-automatic-releases@latest'
|
||||
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
} from 'components';
|
||||
import { useI18nContext } from 'i18n/i18n-react';
|
||||
import type { APIcall } from 'project/types';
|
||||
import type { ESPSystemStatus } from 'types';
|
||||
|
||||
import RestartMonitor from './RestartMonitor';
|
||||
|
||||
@@ -81,9 +82,16 @@ const UploadDownload: FC = () => {
|
||||
'EMS-ESP-' +
|
||||
v.replaceAll('.', '_') +
|
||||
'-' +
|
||||
data.esp_platform.replaceAll('-', '_') +
|
||||
getPlatform().replaceAll('-', '_') +
|
||||
'.bin';
|
||||
|
||||
const getPlatform = () => {
|
||||
if (data.flash_chip_size === 16384) {
|
||||
return data.esp_platform + '-16M';
|
||||
}
|
||||
return data.esp_platform;
|
||||
};
|
||||
|
||||
const {
|
||||
loading: isUploading,
|
||||
uploading: progress,
|
||||
@@ -194,7 +202,7 @@ const UploadDownload: FC = () => {
|
||||
</Typography>
|
||||
<Box p={2} border="2px solid grey" borderRadius={2}>
|
||||
{LL.VERSION_ON() + ' '}
|
||||
<b>{data.emsesp_version}</b> ({data.esp_platform})
|
||||
<b>{data.emsesp_version}</b> ({getPlatform()})
|
||||
<Divider />
|
||||
{latestVersion && (
|
||||
<Box mt={2}>
|
||||
|
||||
Reference in New Issue
Block a user