mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2026-10-28 11:14:58 +00:00
update runners
This commit is contained in:
@@ -30,7 +30,7 @@ jobs:
|
|||||||
uses: actions/checkout@v7
|
uses: actions/checkout@v7
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v6
|
||||||
with:
|
with:
|
||||||
package_json_file: interface/package.json
|
package_json_file: interface/package.json
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ jobs:
|
|||||||
node-version: 26
|
node-version: 26
|
||||||
|
|
||||||
- name: Cache pnpm store
|
- name: Cache pnpm store
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v6
|
||||||
with:
|
with:
|
||||||
path: ~/.local/share/pnpm/store
|
path: ~/.local/share/pnpm/store
|
||||||
key: ${{ runner.os }}-pnpm-${{ hashFiles('interface/package.json') }}
|
key: ${{ runner.os }}-pnpm-${{ hashFiles('interface/package.json') }}
|
||||||
@@ -56,7 +56,7 @@ jobs:
|
|||||||
pnpm build-webUI
|
pnpm build-webUI
|
||||||
|
|
||||||
- name: Upload WWWData.h
|
- name: Upload WWWData.h
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: wwwdata
|
name: wwwdata
|
||||||
path: src/ESP32React/WWWData.h
|
path: src/ESP32React/WWWData.h
|
||||||
@@ -88,7 +88,7 @@ jobs:
|
|||||||
run: platformio run -e build_modbus
|
run: platformio run -e build_modbus
|
||||||
|
|
||||||
- name: Upload modbus header
|
- name: Upload modbus header
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: modbus-header
|
name: modbus-header
|
||||||
path: src/core/modbus_entity_parameters.hpp
|
path: src/core/modbus_entity_parameters.hpp
|
||||||
@@ -117,7 +117,7 @@ jobs:
|
|||||||
run: uv pip install --system pioarduino==6.2.0
|
run: uv pip install --system pioarduino==6.2.0
|
||||||
|
|
||||||
- name: Restore generated modbus header
|
- name: Restore generated modbus header
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: modbus-header
|
name: modbus-header
|
||||||
path: src/core
|
path: src/core
|
||||||
@@ -126,7 +126,7 @@ jobs:
|
|||||||
run: platformio run -e build_standalone
|
run: platformio run -e build_standalone
|
||||||
|
|
||||||
- name: Upload generated docs
|
- name: Upload generated docs
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: generated-docs
|
name: generated-docs
|
||||||
path: |
|
path: |
|
||||||
@@ -160,7 +160,7 @@ jobs:
|
|||||||
enable-cache: false
|
enable-cache: false
|
||||||
|
|
||||||
- name: Cache PlatformIO packages
|
- name: Cache PlatformIO packages
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v6
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.platformio/.cache
|
~/.platformio/.cache
|
||||||
@@ -172,16 +172,16 @@ jobs:
|
|||||||
${{ runner.os }}-pio-
|
${{ runner.os }}-pio-
|
||||||
|
|
||||||
- name: Install pioarduino
|
- name: Install pioarduino
|
||||||
run: uv pip install --system pioarduino==6.2.0 intelhex
|
run: uv pip install --system pioarduino==6.2.0
|
||||||
|
|
||||||
- name: Restore WWWData.h
|
- name: Restore WWWData.h
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: wwwdata
|
name: wwwdata
|
||||||
path: src/ESP32React
|
path: src/ESP32React
|
||||||
|
|
||||||
- name: Restore generated modbus header
|
- name: Restore generated modbus header
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: modbus-header
|
name: modbus-header
|
||||||
path: src/core
|
path: src/core
|
||||||
@@ -199,7 +199,7 @@ jobs:
|
|||||||
run: platformio run -e ${{ matrix.env }}
|
run: platformio run -e ${{ matrix.env }}
|
||||||
|
|
||||||
- name: Upload firmware
|
- name: Upload firmware
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: firmware-${{ matrix.env }}
|
name: firmware-${{ matrix.env }}
|
||||||
path: build/firmware
|
path: build/firmware
|
||||||
@@ -229,19 +229,19 @@ jobs:
|
|||||||
echo "REF=$prev" >> $GITHUB_OUTPUT
|
echo "REF=$prev" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Restore generated modbus header
|
- name: Restore generated modbus header
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: modbus-header
|
name: modbus-header
|
||||||
path: src/core
|
path: src/core
|
||||||
|
|
||||||
- name: Restore generated docs
|
- name: Restore generated docs
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: generated-docs
|
name: generated-docs
|
||||||
path: .
|
path: .
|
||||||
|
|
||||||
- name: Restore firmware binaries
|
- name: Restore firmware binaries
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
pattern: firmware-*
|
pattern: firmware-*
|
||||||
merge-multiple: true
|
merge-multiple: true
|
||||||
@@ -250,6 +250,52 @@ jobs:
|
|||||||
- name: List firmware files
|
- name: List firmware files
|
||||||
run: ls -la build/firmware
|
run: ls -la build/firmware
|
||||||
|
|
||||||
|
# the recovery build needs PlatformIO, and pnpm + Node.js to build its own WebUI (recovery/WWWData.h)
|
||||||
|
- name: Install python 3.13
|
||||||
|
uses: actions/setup-python@v7
|
||||||
|
with:
|
||||||
|
python-version: '3.13'
|
||||||
|
|
||||||
|
- name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v7
|
||||||
|
with:
|
||||||
|
version: "latest"
|
||||||
|
enable-cache: false
|
||||||
|
|
||||||
|
# falls back to the firmware jobs' caches, which hold the same toolchains
|
||||||
|
- name: Cache PlatformIO packages
|
||||||
|
uses: actions/cache@v6
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.platformio/.cache
|
||||||
|
~/.platformio/packages
|
||||||
|
~/.platformio/platforms
|
||||||
|
key: ${{ runner.os }}-pio-recovery-${{ hashFiles('platformio.ini') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-pio-recovery-
|
||||||
|
${{ runner.os }}-pio-
|
||||||
|
|
||||||
|
- name: Install pioarduino
|
||||||
|
run: uv pip install --system pioarduino==6.2.0
|
||||||
|
|
||||||
|
- name: Install pnpm
|
||||||
|
uses: pnpm/action-setup@v6
|
||||||
|
with:
|
||||||
|
package_json_file: interface/package.json
|
||||||
|
|
||||||
|
- name: Install Node.js 26
|
||||||
|
uses: actions/setup-node@v7
|
||||||
|
with:
|
||||||
|
node-version: 26
|
||||||
|
|
||||||
|
- name: Cache pnpm store
|
||||||
|
uses: actions/cache@v6
|
||||||
|
with:
|
||||||
|
path: ~/.local/share/pnpm/store
|
||||||
|
key: ${{ runner.os }}-pnpm-${{ hashFiles('interface/package.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-pnpm-
|
||||||
|
|
||||||
- name: Build the recovery firmware for the 16MB boards
|
- name: Build the recovery firmware for the 16MB boards
|
||||||
run: |
|
run: |
|
||||||
platformio run -e recovery_s_16M -e recovery_s_16M_P -e recovery_s3_16M_P
|
platformio run -e recovery_s_16M -e recovery_s_16M_P -e recovery_s3_16M_P
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install -U "pioarduino==6.2.0"
|
pip install -U "pioarduino==6.2.0"
|
||||||
python -m pip install intelhex
|
|
||||||
|
|
||||||
- name: Build webUI
|
- name: Build webUI
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install -U "pioarduino==6.2.0"
|
pip install -U "pioarduino==6.2.0"
|
||||||
python -m pip install intelhex
|
|
||||||
|
|
||||||
- name: Build webUI
|
- name: Build webUI
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
Reference in New Issue
Block a user