Compare commits
No commits in common. "0ccc67f4b2601ff4199e60fddfcbb3955e463234" and "84617ebc536f1a783f6978e96aa80b0bcdaf729d" have entirely different histories.
0ccc67f4b2
...
84617ebc53
70
.github/workflows/release.yml
vendored
70
.github/workflows/release.yml
vendored
@ -5,73 +5,29 @@ on:
|
|||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write # Required for creating releases
|
|
||||||
issues: read # Required for reading changelog
|
|
||||||
pull-requests: read # Required for reading changelog
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
|
||||||
contents: write # Required for creating releases at job level
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Install PlatformIO
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install --upgrade platformio
|
|
||||||
|
|
||||||
- name: Build Firmware
|
|
||||||
run: |
|
|
||||||
pio run -t buildfs # Build SPIFFS
|
|
||||||
pio run # Build firmware
|
|
||||||
|
|
||||||
- name: Install esptool
|
|
||||||
run: |
|
|
||||||
pip install esptool
|
|
||||||
|
|
||||||
- name: Merge firmware and SPIFFS
|
|
||||||
run: |
|
|
||||||
esptool.py --chip esp32 merge_bin \
|
|
||||||
--flash_mode dio \
|
|
||||||
--flash_freq 40m \
|
|
||||||
--flash_size 4MB \
|
|
||||||
-o .pio/build/esp32dev/filaman.bin \
|
|
||||||
0x10000 .pio/build/esp32dev/firmware.bin \
|
|
||||||
0x290000 .pio/build/esp32dev/spiffs.bin
|
|
||||||
|
|
||||||
- name: Get version from tag
|
- name: Get version from tag
|
||||||
id: get_version
|
id: get_version
|
||||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
|
||||||
|
|
||||||
- name: Read CHANGELOG.md
|
- name: Read CHANGELOG.md
|
||||||
id: changelog
|
id: changelog
|
||||||
run: |
|
run: |
|
||||||
CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
CHANGELOG=$(awk "/## \[${{ steps.get_version.outputs.VERSION }}\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md)
|
||||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
echo "::set-output name=CHANGES::$CHANGELOG"
|
||||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Install and Configure GitHub CLI
|
- name: Create Release
|
||||||
run: |
|
uses: actions/create-release@v1
|
||||||
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
|
|
||||||
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
|
|
||||||
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
|
|
||||||
&& sudo apt update \
|
|
||||||
&& sudo apt install gh -y
|
|
||||||
|
|
||||||
- name: Create Release with GitHub CLI
|
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Changed from GITHUB_TOKEN to GH_TOKEN
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: |
|
with:
|
||||||
gh release create "${{ github.ref_name }}" \
|
tag_name: ${{ github.ref }}
|
||||||
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
release_name: Release ${{ steps.get_version.outputs.VERSION }}
|
||||||
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
body: ${{ steps.changelog.outputs.CHANGES }}
|
||||||
".pio/build/esp32dev/filaman.bin#filaman.bin"
|
draft: false
|
||||||
|
prerelease: false
|
@ -1,5 +0,0 @@
|
|||||||
# Name, Type, SubType, Offset, Size, Flags
|
|
||||||
nvs, data, nvs, 0x9000, 0x5000,
|
|
||||||
otadata, data, ota, 0xe000, 0x2000,
|
|
||||||
app0, app, ota_0, 0x10000, 0x280000,
|
|
||||||
spiffs, data, spiffs, 0x290000,0x170000,
|
|
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.0.6"
|
version = "1.0.5"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
@ -33,7 +33,6 @@ lib_deps =
|
|||||||
board_build.filesystem = spiffs
|
board_build.filesystem = spiffs
|
||||||
board_build.spiffs.partition = 2M
|
board_build.spiffs.partition = 2M
|
||||||
board_build.spiffs.upload_size = 2M
|
board_build.spiffs.upload_size = 2M
|
||||||
board_build.partitions = partitions.csv
|
|
||||||
|
|
||||||
build_flags =
|
build_flags =
|
||||||
-Os
|
-Os
|
||||||
|
Loading…
x
Reference in New Issue
Block a user