fix downloading of 16M builds

This commit is contained in:
proddy
2024-07-21 14:42:47 +02:00
parent 452b3be953
commit 217d2703f5
4 changed files with 23 additions and 16 deletions

View File

@@ -38,13 +38,13 @@ jobs:
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build yarn build
yarn webUI yarn webUI
- name: Build 4M firmware - name: Build ESP32 4M firmware
run: | run: |
platformio run -e ci platformio run -e ci
- name: Build S3 firmware - name: Build ESP32-S3 16M firmware
run: | run: |
platformio run -e ci_s3 platformio run -e ci_s3
- name: Build 16M firmware - name: Build ESP32 16M firmware
run: | run: |
platformio run -e ci_16M platformio run -e ci_16M
- name: Create GitHub Release - name: Create GitHub Release

View File

@@ -35,12 +35,15 @@ jobs:
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build yarn build
yarn webUI yarn webUI
- name: Build 4M firmware - name: Build ESP32 4M firmware
run: | run: |
platformio run -e ci platformio run -e ci
- name: Build S3 firmware - name: Build ESP32-S3 16M firmware
run: | run: |
platformio run -e ci_s3 platformio run -e ci_s3
- name: Build ESP32 16M firmware
run: |
platformio run -e ci_16M
- name: Release - name: Release
uses: 'marvinpinto/action-automatic-releases@latest' uses: 'marvinpinto/action-automatic-releases@latest'
with: with:

View File

@@ -10,7 +10,6 @@ jobs:
pre-release: pre-release:
name: 'Automatic test-release build' name: 'Automatic test-release build'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Enable Corepack - name: Enable Corepack
@@ -22,18 +21,15 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.x' node-version: '20.x'
- name: Get EMS-ESP source code and version - name: Get EMS-ESP source code and version
id: build_info id: build_info
run: | run: |
version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
echo "VERSION=$version" >> $GITHUB_OUTPUT echo "VERSION=$version" >> $GITHUB_OUTPUT
- name: Install PlatformIO - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install -U platformio pip install -U platformio
- name: Build WebUI - name: Build WebUI
run: | run: |
cd interface cd interface
@@ -42,15 +38,15 @@ jobs:
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build yarn build
yarn webUI yarn webUI
- name: Build ESP32 4M firmware
- name: Build firmware
run: | run: |
platformio run -e ci platformio run -e ci
- name: Build ESP32-S3 16M firmware
- name: Build S3 firmware
run: | run: |
platformio run -e ci_s3 platformio run -e ci_s3
- name: Build ESP32 16M firmware
run: |
platformio run -e ci_16M
- name: Create a GH Release - name: Create a GH Release
id: 'automatic_releases' id: 'automatic_releases'
uses: 'marvinpinto/action-automatic-releases@latest' uses: 'marvinpinto/action-automatic-releases@latest'

View File

@@ -16,6 +16,7 @@ import {
} from 'components'; } from 'components';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';
import type { APIcall } from 'project/types'; import type { APIcall } from 'project/types';
import type { ESPSystemStatus } from 'types';
import RestartMonitor from './RestartMonitor'; import RestartMonitor from './RestartMonitor';
@@ -81,9 +82,16 @@ const UploadDownload: FC = () => {
'EMS-ESP-' + 'EMS-ESP-' +
v.replaceAll('.', '_') + v.replaceAll('.', '_') +
'-' + '-' +
data.esp_platform.replaceAll('-', '_') + getPlatform().replaceAll('-', '_') +
'.bin'; '.bin';
const getPlatform = () => {
if (data.flash_chip_size === 16384) {
return data.esp_platform + '-16M';
}
return data.esp_platform;
};
const { const {
loading: isUploading, loading: isUploading,
uploading: progress, uploading: progress,
@@ -194,7 +202,7 @@ const UploadDownload: FC = () => {
</Typography> </Typography>
<Box p={2} border="2px solid grey" borderRadius={2}> <Box p={2} border="2px solid grey" borderRadius={2}>
{LL.VERSION_ON() + ' '} {LL.VERSION_ON() + ' '}
<b>{data.emsesp_version}</b>&nbsp;({data.esp_platform}) <b>{data.emsesp_version}</b>&nbsp;({getPlatform()})
<Divider /> <Divider />
{latestVersion && ( {latestVersion && (
<Box mt={2}> <Box mt={2}>