mirror of
https://github.com/lumapu/ahoy.git
synced 2025-07-25 20:27:18 +02:00
fix partitions for 16MB variants
update yml files for github actions
This commit is contained in:
parent
8217448d3e
commit
d607bf1041
3 changed files with 88 additions and 17 deletions
2
.github/workflows/compile_development.yml
vendored
2
.github/workflows/compile_development.yml
vendored
|
@ -92,7 +92,7 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
variant:
|
variant:
|
||||||
- opendtufusion-de
|
- opendtufusion-de
|
||||||
- opendtufusion-16MB-de
|
#- opendtufusion-16MB-de #not needed, only the partions.bin is different and can be used from english build
|
||||||
- esp8266-de
|
- esp8266-de
|
||||||
- esp8266-all-de
|
- esp8266-all-de
|
||||||
- esp8266-prometheus-de
|
- esp8266-prometheus-de
|
||||||
|
|
102
.github/workflows/compile_release.yml
vendored
102
.github/workflows/compile_release.yml
vendored
|
@ -7,34 +7,34 @@ on:
|
||||||
- '**.md' # Do no build on *.md changes
|
- '**.md' # Do no build on *.md changes
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
check:
|
||||||
name: Build Environments
|
name: Check Repository
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.repository == 'lumapu/ahoy' && github.ref_name == 'main'
|
if: github.repository == 'lumapu/ahoy' && github.ref_name == 'main'
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
build-en:
|
||||||
|
name: Build (EN)
|
||||||
|
needs: check
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
continue-on-error: false
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
variant:
|
variant:
|
||||||
|
- opendtufusion
|
||||||
|
- opendtufusion-16MB
|
||||||
- esp8266
|
- esp8266
|
||||||
|
- esp8266-all
|
||||||
|
- esp8266-minimal
|
||||||
- esp8266-prometheus
|
- esp8266-prometheus
|
||||||
- esp8285
|
- esp8285
|
||||||
- esp32-wroom32
|
- esp32-wroom32
|
||||||
|
- esp32-wroom32-minimal
|
||||||
- esp32-wroom32-prometheus
|
- esp32-wroom32-prometheus
|
||||||
- esp32-wroom32-ethernet
|
|
||||||
- esp32-s2-mini
|
- esp32-s2-mini
|
||||||
- esp32-c3-mini
|
- esp32-c3-mini
|
||||||
- opendtufusion
|
|
||||||
- opendtufusion-ethernet
|
|
||||||
- esp8266-de
|
|
||||||
- esp8266-prometheus-de
|
|
||||||
- esp8285-de
|
|
||||||
- esp32-wroom32-de
|
|
||||||
- esp32-wroom32-prometheus-de
|
|
||||||
- esp32-wroom32-ethernet-de
|
|
||||||
- esp32-s2-mini-de
|
|
||||||
- esp32-c3-mini-de
|
|
||||||
- opendtufusion-de
|
|
||||||
- opendtufusion-ethernet-de
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: benjlevesque/short-sha@v3.0
|
- uses: benjlevesque/short-sha@v3.0
|
||||||
|
@ -69,6 +69,11 @@ jobs:
|
||||||
- name: Run PlatformIO
|
- name: Run PlatformIO
|
||||||
run: pio run -d src -e ${{ matrix.variant }}
|
run: pio run -d src -e ${{ matrix.variant }}
|
||||||
|
|
||||||
|
- name: Compress .elf
|
||||||
|
uses: edgarrc/action-7z@v1
|
||||||
|
with:
|
||||||
|
args: 7z a -t7z -mx=9 src/.pio/build/${{ matrix.variant }}/firmware.elf.7z ./src/.pio/build/${{ matrix.variant }}/firmware.elf
|
||||||
|
|
||||||
- name: Rename Firmware
|
- name: Rename Firmware
|
||||||
run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT
|
run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
@ -78,11 +83,76 @@ jobs:
|
||||||
name: ${{ matrix.variant }}
|
name: ${{ matrix.variant }}
|
||||||
path: firmware/*
|
path: firmware/*
|
||||||
|
|
||||||
|
build-de:
|
||||||
|
name: Build (DE)
|
||||||
|
needs: check
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
continue-on-error: false
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
variant:
|
||||||
|
- opendtufusion-de
|
||||||
|
#- opendtufusion-16MB-de #not needed, only the partions.bin is different and can be used from english build
|
||||||
|
- esp8266-de
|
||||||
|
- esp8266-all-de
|
||||||
|
- esp8266-prometheus-de
|
||||||
|
- esp8285-de
|
||||||
|
- esp32-wroom32-de
|
||||||
|
- esp32-wroom32-prometheus-de
|
||||||
|
- esp32-s2-mini-de
|
||||||
|
- esp32-c3-mini-de
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: benjlevesque/short-sha@v3.0
|
||||||
|
id: short-sha
|
||||||
|
with:
|
||||||
|
length: 7
|
||||||
|
|
||||||
|
- name: Cache Pip
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/pip
|
||||||
|
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-pip-
|
||||||
|
|
||||||
|
- name: Cache PlatformIO
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.platformio
|
||||||
|
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
|
||||||
|
|
||||||
|
- name: Setup Python
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.x"
|
||||||
|
|
||||||
|
- name: Install PlatformIO
|
||||||
|
run: |
|
||||||
|
python -m pip install setuptools --upgrade pip
|
||||||
|
pip install --upgrade platformio
|
||||||
|
|
||||||
|
- name: Run PlatformIO
|
||||||
|
run: pio run -d src -e ${{ matrix.variant }}
|
||||||
|
|
||||||
|
- name: Compress .elf
|
||||||
|
uses: edgarrc/action-7z@v1
|
||||||
|
with:
|
||||||
|
args: 7z a -t7z -mx=9 src/.pio/build/${{ matrix.variant }}/firmware.elf.7z ./src/.pio/build/${{ matrix.variant }}/firmware.elf
|
||||||
|
|
||||||
|
- name: Rename Firmware
|
||||||
|
run: python scripts/getVersion.py ${{ matrix.variant }} >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Create Artifact
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.variant }}
|
||||||
|
path: firmware/*
|
||||||
|
|
||||||
release:
|
release:
|
||||||
name: Create Release
|
name: Create Release
|
||||||
|
needs: [build-en, build-de]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build]
|
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
|
@ -327,6 +327,7 @@ monitor_filters =
|
||||||
platform = espressif32@6.7.0
|
platform = espressif32@6.7.0
|
||||||
board = esp32-s3-devkitc-1
|
board = esp32-s3-devkitc-1
|
||||||
board_upload.flash_size = 16MB
|
board_upload.flash_size = 16MB
|
||||||
|
board_build.partitions = default_16MB.csv
|
||||||
upload_protocol = esp-builtin
|
upload_protocol = esp-builtin
|
||||||
build_flags = ${env:opendtufusion.build_flags}
|
build_flags = ${env:opendtufusion.build_flags}
|
||||||
monitor_filters =
|
monitor_filters =
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue