Compare commits
126 Commits
v1.2.102
...
72c2fb70c2
Author | SHA1 | Date | |
---|---|---|---|
72c2fb70c2 | |||
f2f3f0ab9f | |||
c07692c218 | |||
a184903b66 | |||
af1640383d | |||
c00e54b145 | |||
f6c92c686b | |||
b8db01529b | |||
55db6d76ab | |||
a18749a1ff | |||
1811fd9159 | |||
b550760427 | |||
c5033acadc | |||
7de4189c83 | |||
f43f2a15b2 | |||
858192c6cb | |||
e2bd39922d | |||
c86cc7173e | |||
16362e66a3 | |||
48d9ba8f71 | |||
e2bea5a0c3 | |||
3e11f65188 | |||
df59c42c8a | |||
abe1d7c930 | |||
ca614c3cc4 | |||
5153374093 | |||
66db4d7a85 | |||
90e71922b1 | |||
e8e5c0bd3d | |||
7e53e1ccb0 | |||
e49e812b13 | |||
b1e0fcfadf | |||
31ef3ac8df | |||
8cf3f87c89 | |||
c446188311 | |||
8e2a8d597d | |||
7d3b1c34f6 | |||
b95c61118b | |||
0dfb158959 | |||
75c774bb24 | |||
cf80adb43c | |||
36d50cbe7f | |||
9148d207c7 | |||
5f6fef9448 | |||
946202de0e | |||
41a3717347 | |||
255c820439 | |||
aef3ba77ba | |||
2592c3a497 | |||
a48c5dfef0 | |||
00554d0b09 | |||
05a91cd8d8 | |||
7cf113eaff | |||
44d27adab2 | |||
e0a2dff5fe | |||
519a089684 | |||
ef053bb2b6 | |||
0a91c7b269 | |||
875d9d2b70 | |||
52840b9b0b | |||
da1fc7678f | |||
982bb5aa21 | |||
007737db13 | |||
17e5949201 | |||
6a57186091 | |||
babd3f47a0 | |||
5372fe10fe | |||
e0c9d90892 | |||
e5f5d1961b | |||
31a960fb9e | |||
3c2e75b77a | |||
367143c456 | |||
fbde4b764f | |||
e57f4216d4 | |||
b8beb992d6 | |||
4234b2254e | |||
b8faf79163 | |||
d35afaff46 | |||
a8a00372b5 | |||
72f4eab588 | |||
afa4eddc00 | |||
b0888e7e63 | |||
238a84a8a2 | |||
59cc00ca13 | |||
ab083f5f57 | |||
c111573206 | |||
52b2494e52 | |||
069ec2d7a1 | |||
94e35ae86e | |||
d71e3d8184 | |||
bb166aa29f | |||
0d718023f8 | |||
b16781043f | |||
dff184ff25 | |||
0ce281221d | |||
bc26c160e8 | |||
c25f41db75 | |||
e107c17f50 | |||
85b9d03ebd | |||
17b188626a | |||
a534c5f872 | |||
93f7582790 | |||
46acc63756 | |||
67a9e1bdce | |||
2b75b64b4a | |||
8d003295e7 | |||
f89500946a | |||
14e745ff06 | |||
d058397fa2 | |||
622f5403a7 | |||
92b78a86dd | |||
ec399390e8 | |||
909c4e9b5e | |||
f4b20bfffd | |||
78464215a9 | |||
4365f0463a | |||
727bc0e760 | |||
04604013eb | |||
cf5fc5f6f1 | |||
945a4ccce6 | |||
7cf9e2d145 | |||
9db4e338ea | |||
dea6ca2c66 | |||
e224e72e41 | |||
306c517da7 | |||
0337bbabe0 |
167
.github/workflows/gitea-release.yml
vendored
Normal file
167
.github/workflows/gitea-release.yml
vendored
Normal file
@ -0,0 +1,167 @@
|
||||
name: Gitea Release
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
secrets:
|
||||
GITEA_TOKEN:
|
||||
description: 'Token für Gitea API-Zugriff'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- 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 esptool
|
||||
|
||||
- name: Install xxd
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install xxd
|
||||
|
||||
- name: Build Firmware
|
||||
run: |
|
||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
||||
|
||||
# Build firmware and SPIFFS
|
||||
echo "Building firmware and SPIFFS..."
|
||||
pio run -e esp32dev
|
||||
pio run -t buildfs
|
||||
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||
|
||||
# Create SPIFFS binary with minimal ESP32 image header (chip version set to max supported)
|
||||
echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\xFF\xFF\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
# Append the actual SPIFFS data
|
||||
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin 2>/dev/null
|
||||
|
||||
# Create full binary
|
||||
(cd .pio/build/esp32dev &&
|
||||
esptool.py --chip esp32 merge_bin \
|
||||
--fill-flash-size 4MB \
|
||||
--flash_mode dio \
|
||||
--flash_freq 40m \
|
||||
--flash_size 4MB \
|
||||
-o filaman_full_${VERSION}.bin \
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x3D0000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
(cd .pio/build/esp32dev && ls -lh *.bin)
|
||||
|
||||
- name: Get version from platformio.ini
|
||||
id: get_version
|
||||
run: |
|
||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
||||
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Read CHANGELOG.md
|
||||
id: changelog
|
||||
run: |
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Determine Gitea URL
|
||||
id: gitea_url
|
||||
run: |
|
||||
echo "Debug Environment:"
|
||||
echo "GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-not set}"
|
||||
echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
|
||||
echo "GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-not set}"
|
||||
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
|
||||
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
|
||||
|
||||
# Set API URL based on environment
|
||||
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
|
||||
GITEA_API_URL="${GITHUB_SERVER_URL}"
|
||||
GITEA_REPO=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f2)
|
||||
GITEA_OWNER=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f1)
|
||||
else
|
||||
echo "Error: This workflow is only for Gitea"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "GITEA_API_URL=${GITEA_API_URL}" >> $GITHUB_OUTPUT
|
||||
echo "GITEA_REPO=${GITEA_REPO}" >> $GITHUB_OUTPUT
|
||||
echo "GITEA_OWNER=${GITEA_OWNER}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create Gitea Release
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_API_URL: ${{ steps.gitea_url.outputs.GITEA_API_URL }}
|
||||
GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }}
|
||||
GITEA_OWNER: ${{ steps.gitea_url.outputs.GITEA_OWNER }}
|
||||
run: |
|
||||
# Debug Token (nur Länge ausgeben für Sicherheit)
|
||||
echo "Debug: Token length: ${#GITEA_TOKEN}"
|
||||
if [ -z "$GITEA_TOKEN" ]; then
|
||||
echo "Error: GITEA_TOKEN is empty"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
cd .pio/build/esp32dev
|
||||
|
||||
# Debug-Ausgaben
|
||||
echo "Debug: API URL: ${GITEA_API_URL}"
|
||||
echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}"
|
||||
|
||||
# Erstelle zuerst den Release ohne Dateien
|
||||
echo "Debug: Creating release..."
|
||||
RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}"
|
||||
|
||||
RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \
|
||||
-X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "${RELEASE_DATA}" \
|
||||
"${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases")
|
||||
|
||||
RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1)
|
||||
RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1)
|
||||
|
||||
if [ "$RELEASE_STATUS" != "201" ]; then
|
||||
echo "Error: Failed to create release"
|
||||
echo "Response: $RELEASE_BODY"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extrahiere die Release-ID aus der Antwort
|
||||
RELEASE_ID=$(echo "$RELEASE_BODY" | grep -o '"id":[0-9]*' | cut -d':' -f2)
|
||||
|
||||
# Lade die Dateien einzeln hoch
|
||||
for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
|
||||
if [ -f "$file" ]; then
|
||||
echo "Debug: Uploading $file..."
|
||||
UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \
|
||||
-X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary @"$file" \
|
||||
"${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases/${RELEASE_ID}/assets?name=${file}")
|
||||
|
||||
UPLOAD_STATUS=$(echo "$UPLOAD_RESPONSE" | tail -n1)
|
||||
if [ "$UPLOAD_STATUS" != "201" ]; then
|
||||
echo "Warning: Failed to upload $file"
|
||||
echo "Response: $(echo "$UPLOAD_RESPONSE" | head -n -1)"
|
||||
else
|
||||
echo "Successfully uploaded $file"
|
||||
fi
|
||||
fi
|
||||
done
|
@ -2,6 +2,13 @@ name: GitHub Release
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
secrets:
|
||||
RELEASE_TOKEN:
|
||||
description: 'GitHub token for release creation'
|
||||
required: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
@ -10,6 +17,8 @@ jobs:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
@ -26,28 +35,6 @@ jobs:
|
||||
sudo apt-get update
|
||||
sudo apt-get install xxd
|
||||
|
||||
- name: Check for Data changes
|
||||
id: check_data
|
||||
run: |
|
||||
git fetch --unshallow || true
|
||||
CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
|
||||
if echo "$CHANGED_FILES" | grep -q "^data/"; then
|
||||
echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Check for SPIFFS changes
|
||||
id: check_spiffs
|
||||
run: |
|
||||
git fetch --unshallow || true
|
||||
CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
|
||||
if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
|
||||
echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Build Firmware
|
||||
run: |
|
||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
||||
@ -58,10 +45,12 @@ jobs:
|
||||
pio run -t buildfs
|
||||
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||
|
||||
# Always create SPIFFS binary
|
||||
cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.bin
|
||||
# Create SPIFFS binary with minimal ESP32 image header (chip version set to max supported)
|
||||
echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\xFF\xFF\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
# Append the actual SPIFFS data
|
||||
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin 2>/dev/null
|
||||
|
||||
# Create full binary (always)
|
||||
(cd .pio/build/esp32dev &&
|
||||
@ -74,7 +63,7 @@ jobs:
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x390000 spiffs.bin)
|
||||
0x3D0000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
@ -97,22 +86,22 @@ jobs:
|
||||
|
||||
- name: Create GitHub Release
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||
run: |
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
cd .pio/build/esp32dev
|
||||
|
||||
# Create release with available files
|
||||
cd .pio/build/esp32dev
|
||||
FILES_TO_UPLOAD=""
|
||||
|
||||
# Always add firmware
|
||||
if [ -f "filaman_${VERSION}.bin" ]; then
|
||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
|
||||
if [ -f "upgrade_filaman_firmware_v${VERSION}.bin" ]; then
|
||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
|
||||
fi
|
||||
|
||||
# Add SPIFFS and full binary only if they exist
|
||||
if [ -f "webpage_${VERSION}.bin" ]; then
|
||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
|
||||
if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then
|
||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
|
||||
fi
|
||||
|
||||
if [ -f "filaman_full_${VERSION}.bin" ]; then
|
182
.github/workflows/providers/gitea-release.yml
vendored
182
.github/workflows/providers/gitea-release.yml
vendored
@ -1,182 +0,0 @@
|
||||
name: Gitea Release
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
gitea_server_url:
|
||||
required: true
|
||||
type: string
|
||||
gitea_repository:
|
||||
required: true
|
||||
type: string
|
||||
secrets:
|
||||
GITEA_TOKEN:
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- 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 esptool
|
||||
|
||||
- name: Install xxd
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install xxd
|
||||
|
||||
- name: Check for SPIFFS changes
|
||||
id: check_spiffs
|
||||
run: |
|
||||
git fetch --unshallow || true
|
||||
CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
|
||||
if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
|
||||
echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Check for Data changes
|
||||
id: check_data
|
||||
run: |
|
||||
git fetch --unshallow || true
|
||||
CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
|
||||
if echo "$CHANGED_FILES" | grep -q "^data/"; then
|
||||
echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Get version from platformio.ini
|
||||
id: get_version
|
||||
run: |
|
||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
||||
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build Firmware
|
||||
run: |
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
|
||||
# Always build firmware and SPIFFS
|
||||
echo "Building firmware and SPIFFS..."
|
||||
pio run -e esp32dev
|
||||
pio run -t buildfs
|
||||
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
||||
|
||||
# Always create SPIFFS binary
|
||||
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
|
||||
|
||||
# Create full binary (always)
|
||||
(cd .pio/build/esp32dev &&
|
||||
esptool.py --chip esp32 merge_bin \
|
||||
--fill-flash-size 4MB \
|
||||
--flash_mode dio \
|
||||
--flash_freq 40m \
|
||||
--flash_size 4MB \
|
||||
-o filaman_full_${VERSION}.bin \
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x390000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
(cd .pio/build/esp32dev && ls -lh *.bin)
|
||||
|
||||
- name: Prepare binaries
|
||||
run: |
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
|
||||
# Create full binary only if SPIFFS changed
|
||||
if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
|
||||
echo "Creating full binary..."
|
||||
cd .pio/build/esp32dev && \
|
||||
esptool.py --chip esp32 merge_bin \
|
||||
--fill-flash-size 4MB \
|
||||
--flash_mode dio \
|
||||
--flash_freq 40m \
|
||||
--flash_size 4MB \
|
||||
-o filaman_full_${VERSION}.bin \
|
||||
0x0000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x390000 spiffs.bin
|
||||
fi
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
cd .pio/build/esp32dev && ls -lh *.bin
|
||||
|
||||
- name: Read CHANGELOG.md
|
||||
id: changelog
|
||||
run: |
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create Release
|
||||
env:
|
||||
TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
run: |
|
||||
API_URL="${{ inputs.gitea_server_url }}/api/v1"
|
||||
REPO="${{ inputs.gitea_repository }}"
|
||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||
|
||||
# Create release
|
||||
RESPONSE=$(curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{
|
||||
\"tag_name\":\"v${VERSION}\",
|
||||
\"name\":\"Release ${VERSION}\",
|
||||
\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
|
||||
}" \
|
||||
"${API_URL}/repos/${REPO}/releases")
|
||||
|
||||
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
|
||||
|
||||
if [ -n "$RELEASE_ID" ]; then
|
||||
echo "Release created with ID: $RELEASE_ID"
|
||||
|
||||
# Always upload firmware and full binary
|
||||
for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do
|
||||
if [ -f ".pio/build/esp32dev/$file" ]; then
|
||||
echo "Uploading $file..."
|
||||
curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary "@.pio/build/esp32dev/$file" \
|
||||
"${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
|
||||
fi
|
||||
done
|
||||
|
||||
# Upload SPIFFS binary only if it exists (data changes)
|
||||
if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then
|
||||
echo "Uploading webpage binary..."
|
||||
curl -k -s \
|
||||
-X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" \
|
||||
"${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin"
|
||||
fi
|
||||
else
|
||||
echo "Failed to create release. Response:"
|
||||
echo "$RESPONSE"
|
||||
exit 1
|
||||
fi
|
59
.github/workflows/release.yml
vendored
59
.github/workflows/release.yml
vendored
@ -5,66 +5,37 @@ on:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
route:
|
||||
detect-provider:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
provider: ${{ steps.provider.outputs.provider }}
|
||||
gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
|
||||
gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
|
||||
gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Debug Environment
|
||||
run: |
|
||||
echo "CI Environment Details:"
|
||||
echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
|
||||
echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
|
||||
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
|
||||
echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
|
||||
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
|
||||
|
||||
- name: Determine CI Provider
|
||||
id: provider
|
||||
shell: bash
|
||||
run: |
|
||||
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
|
||||
echo "provider=gitea" >> "$GITHUB_OUTPUT"
|
||||
echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
|
||||
echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
|
||||
echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
|
||||
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
|
||||
echo "provider=github" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "provider=unknown" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
verify-provider:
|
||||
needs: route
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Echo detected provider
|
||||
run: |
|
||||
echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
|
||||
if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
|
||||
echo "::error::Failed to detect CI provider!"
|
||||
exit 1
|
||||
echo "provider=github" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
github-release:
|
||||
needs: [route, verify-provider]
|
||||
if: needs.route.outputs.provider == 'github'
|
||||
uses: ./.github/workflows/providers/github-release.yml
|
||||
needs: detect-provider
|
||||
permissions:
|
||||
contents: write
|
||||
if: needs.detect-provider.outputs.provider == 'github'
|
||||
uses: ./.github/workflows/github-release.yml
|
||||
secrets:
|
||||
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
gitea-release:
|
||||
needs: [route, verify-provider]
|
||||
if: needs.route.outputs.provider == 'gitea'
|
||||
uses: ./.github/workflows/providers/gitea-release.yml
|
||||
with:
|
||||
gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
|
||||
gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
|
||||
gitea_repository: ${{ needs.route.outputs.gitea_repository }}
|
||||
needs: detect-provider
|
||||
if: needs.detect-provider.outputs.provider == 'gitea'
|
||||
uses: ./.github/workflows/gitea-release.yml
|
||||
secrets:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
281
CHANGELOG.md
281
CHANGELOG.md
@ -1,5 +1,286 @@
|
||||
# Changelog
|
||||
|
||||
## [1.3.39] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.39
|
||||
- workflow: update SPIFFS binary creation to set chip version to max supported
|
||||
|
||||
|
||||
## [1.3.38] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.38
|
||||
- workflow: update SPIFFS binary creation with minimal ESP32 image header
|
||||
|
||||
|
||||
## [1.3.37] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.37
|
||||
- workflow: update ESP32-WROOM image header for SPIFFS binary creation
|
||||
|
||||
|
||||
## [1.3.36] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.36
|
||||
- partition: update SPIFFS binary header and offsets in workflow files
|
||||
|
||||
|
||||
## [1.3.35] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.35
|
||||
- partition: update SPIFFS binary header and offsets in workflow files
|
||||
|
||||
|
||||
## [1.3.34] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.34
|
||||
- partition: update SPIFFS binary creation and offsets in workflow files
|
||||
|
||||
|
||||
## [1.3.33] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.33
|
||||
- partition: update spiffs offset and app sizes in partition files
|
||||
- partition: update spiffs offset in partition files
|
||||
- partition: update app sizes and offsets in partitions.csv
|
||||
|
||||
|
||||
## [1.3.32] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.32
|
||||
- workflow: update magic byte for SPIFFS binary creation
|
||||
|
||||
|
||||
## [1.3.31] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.31
|
||||
- workflow: remove unnecessary data and SPIFFS change checks from release workflows
|
||||
|
||||
|
||||
## [1.3.30] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.30
|
||||
- workflow: update Gitea and GitHub release workflows to create SPIFFS binary with magic byte
|
||||
|
||||
|
||||
## [1.3.29] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.29
|
||||
- workflow: update Gitea release workflow to create release before file uploads
|
||||
|
||||
|
||||
## [1.3.28] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.28
|
||||
- workflow: update Gitea release workflow to use file uploads with curl
|
||||
|
||||
|
||||
## [1.3.27] - 2025-02-21
|
||||
### Added
|
||||
- workflow: add GITEA_TOKEN secret for Gitea API access in release workflows
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.27
|
||||
|
||||
|
||||
## [1.3.26] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.26
|
||||
|
||||
### Fixed
|
||||
- workflow: improve Gitea release workflow with enhanced error handling and debug outputs
|
||||
|
||||
|
||||
## [1.3.25] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.25
|
||||
- workflow: update Gitea release workflow to include RUNNER_NAME and improve error handling
|
||||
|
||||
|
||||
## [1.3.24] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.24
|
||||
- workflow: rename update files to upgrade in GitHub release workflow
|
||||
- workflow: aktualisiere bestehende Einträge im Changelog für vorhandene Versionen
|
||||
|
||||
### Fixed
|
||||
- workflow: improve Gitea release process with dynamic URL determination and debug outputs
|
||||
|
||||
|
||||
## [1.3.23] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.23
|
||||
|
||||
### Fixed
|
||||
- workflow: enhance Gitea release process with debug outputs and API connection checks
|
||||
|
||||
|
||||
## [1.3.22] - 2025-02-21
|
||||
### Added
|
||||
- workflow: improve Gitea release process with additional environment variables and error handling
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.22
|
||||
|
||||
|
||||
## [1.3.21] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.21
|
||||
- workflow: enhance Gitea release process with API integration and token management
|
||||
|
||||
|
||||
## [1.3.20] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.20
|
||||
- workflow: enable git tagging and pushing for Gitea releases
|
||||
|
||||
|
||||
## [1.3.19] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.19
|
||||
- workflow: enable git push for version tagging in Gitea release
|
||||
|
||||
|
||||
## [1.3.18] - 2025-02-21
|
||||
### Changed
|
||||
- ACHTUNG: Installiere einmal das filaman_full.bin danach kannst du über die upgrade Files aktualisieren und deine Settings bleiben auch erhalten.
|
||||
- ATTENTION: Install the filaman_full.bin once, then you can update via the upgrade files and your settings will also be retained.
|
||||
|
||||
|
||||
|
||||
## [1.3.18] - 2025-02-21
|
||||
### Added
|
||||
- add note about filaman_full.bin installation in changelog
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.18
|
||||
- update changelog for version 1.3.18 and enhance update script for existing entries
|
||||
|
||||
## [1.3.17] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.17
|
||||
- ci: comment out git tag and push commands in gitea-release workflow
|
||||
|
||||
|
||||
## [1.3.16] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.16
|
||||
- ci: update filenames for firmware and website binaries in release workflows
|
||||
|
||||
|
||||
## [1.3.15] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.15
|
||||
|
||||
### Fixed
|
||||
- ci: fix missing 'fi' in GitHub release workflow script
|
||||
|
||||
|
||||
## [1.3.14] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.14
|
||||
- ci: update GitHub release workflow to improve file upload handling
|
||||
|
||||
|
||||
## [1.3.13] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.13
|
||||
- ci: update GitHub release workflow to use RELEASE_TOKEN for improved security
|
||||
|
||||
|
||||
## [1.3.12] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.12
|
||||
- ci: enhance GitHub release workflow with token handling and file upload improvements
|
||||
|
||||
|
||||
## [1.3.11] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.11
|
||||
- ci: refactor Gitea release workflow by simplifying input handling and removing unnecessary checks
|
||||
|
||||
|
||||
## [1.3.10] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.10
|
||||
- ci: simplify GitHub release workflow by removing provider verification step
|
||||
|
||||
|
||||
## [1.3.9] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.9
|
||||
- ci: comment out permissions for GitHub release workflow
|
||||
|
||||
|
||||
## [1.3.8] - 2025-02-21
|
||||
### Added
|
||||
- add Gitea and GitHub release workflows
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.8
|
||||
|
||||
|
||||
## [1.3.7] - 2025-02-21
|
||||
### Added
|
||||
- add GitHub and Gitea release workflows
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.7
|
||||
|
||||
|
||||
## [1.3.6] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.6
|
||||
|
||||
### Fixed
|
||||
- update GitHub token reference and correct file path in release workflow
|
||||
|
||||
|
||||
## [1.3.5] - 2025-02-21
|
||||
### Added
|
||||
- enhance release workflow to support Gitea alongside GitHub
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.5
|
||||
|
||||
|
||||
## [1.3.4] - 2025-02-21
|
||||
### Added
|
||||
- add Gitea and GitHub release workflows
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.4
|
||||
- Merge branch 'old'
|
||||
|
||||
|
||||
## [1.3.3] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.3.3
|
||||
|
||||
### Fixed
|
||||
- correct directory path in GitHub workflows for SPIFFS binary
|
||||
|
||||
|
||||
## [1.3.2] - 2025-02-21
|
||||
### Added
|
||||
- add missing conditional exit in release workflow
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.2
|
||||
|
||||
|
||||
## [1.3.1] - 2025-02-21
|
||||
### Added
|
||||
- enhance GitHub and Gitea release workflows with Python setup and binary preparation
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.1
|
||||
|
||||
|
||||
## [1.3.0] - 2025-02-21
|
||||
### Changed
|
||||
- bump version to 1.3.0 in platformio.ini
|
||||
|
||||
|
||||
## [1.2.102] - 2025-02-21
|
||||
### Changed
|
||||
- update webpages for version v1.2.102
|
||||
|
@ -167,12 +167,12 @@
|
||||
}
|
||||
|
||||
// Validate file name pattern
|
||||
if (updateType === 'firmware' && !file.name.startsWith('filaman_')) {
|
||||
alert('Please select a valid firmware file (filaman_*.bin)');
|
||||
if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) {
|
||||
alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)');
|
||||
return;
|
||||
}
|
||||
if (updateType === 'webpage' && !file.name.startsWith('webpage_')) {
|
||||
alert('Please select a valid webpage file (webpage_*.bin)');
|
||||
if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) {
|
||||
alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)');
|
||||
return;
|
||||
}
|
||||
|
||||
@ -202,6 +202,16 @@
|
||||
let response = this.responseText;
|
||||
try {
|
||||
const jsonResponse = JSON.parse(response);
|
||||
|
||||
// Handle progress updates
|
||||
if (jsonResponse.progress !== undefined) {
|
||||
const percent = jsonResponse.progress;
|
||||
progress.style.width = percent + '%';
|
||||
progress.textContent = Math.round(percent) + '%';
|
||||
return;
|
||||
}
|
||||
|
||||
// Handle success/error messages
|
||||
response = jsonResponse.message;
|
||||
|
||||
if (jsonResponse.restart) {
|
||||
@ -218,12 +228,9 @@
|
||||
}, 1000);
|
||||
}
|
||||
} catch (e) {
|
||||
if (!isNaN(response)) {
|
||||
const percent = parseInt(response);
|
||||
progress.style.width = percent + '%';
|
||||
progress.textContent = percent + '%';
|
||||
return;
|
||||
}
|
||||
console.error('JSON parse error:', e);
|
||||
status.textContent = 'Update failed: Invalid response from server';
|
||||
status.classList.add('error');
|
||||
}
|
||||
|
||||
status.textContent = response;
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Name, Type, SubType, Offset, Size, Flags
|
||||
nvs, data, nvs, 0x9000, 0x5000,
|
||||
otadata, data, ota, 0xe000, 0x2000,
|
||||
app0, app, ota_0, 0x10000, 0x180000,
|
||||
app1, app, ota_1, 0x190000, 0x180000,
|
||||
spiffs, data, spiffs, 0x310000, 0xE0000,
|
||||
app0, app, ota_0, 0x10000, 0x1E0000,
|
||||
app1, app, ota_1, 0x1F0000, 0x1E0000,
|
||||
spiffs, data, spiffs, 0x3D0000, 0x30000,
|
|
@ -9,7 +9,9 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.102"
|
||||
version = "1.3.39"
|
||||
|
||||
#test
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
@ -52,12 +54,8 @@ build_flags =
|
||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||
-DOTA_DEBUG=1
|
||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||
-DCONFIG_ESP32_PANIC_PRINT_REBOOT
|
||||
-DBOOT_APP_PARTITION_OTA_0=1
|
||||
-DCONFIG_LOG_DEFAULT_LEVEL=3
|
||||
-DCONFIG_LWIP_TCP_MSL=60000
|
||||
-DCONFIG_LWIP_TCP_WND_DEFAULT=8192
|
||||
-DCONFIG_LWIP_TCP_SND_BUF_DEFAULT=4096
|
||||
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096
|
||||
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
||||
|
||||
|
@ -122,7 +122,29 @@ def update_changelog():
|
||||
f.write(updated_content)
|
||||
push_changes(version)
|
||||
else:
|
||||
print(f"Version {version} already exists in changelog")
|
||||
# Version existiert bereits, aktualisiere die bestehenden Einträge
|
||||
version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}"
|
||||
next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}"
|
||||
|
||||
# Finde den Start der aktuellen Version
|
||||
version_match = re.search(version_pattern, content)
|
||||
if version_match:
|
||||
version_start = version_match.start()
|
||||
# Suche nach der nächsten Version
|
||||
next_version_match = re.search(next_version_pattern, content[version_start + 1:])
|
||||
|
||||
if next_version_match:
|
||||
# Ersetze den Inhalt zwischen aktueller und nächster Version
|
||||
next_version_pos = version_start + 1 + next_version_match.start()
|
||||
updated_content = content[:version_start] + changelog_entry + content[next_version_pos:]
|
||||
else:
|
||||
# Wenn keine nächste Version existiert, ersetze bis zum Ende
|
||||
updated_content = content[:version_start] + changelog_entry + "\n"
|
||||
|
||||
with open(changelog_path, 'w') as f:
|
||||
f.write(updated_content)
|
||||
push_changes(version)
|
||||
print(f"Updated entries for version {version}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
update_changelog()
|
Reference in New Issue
Block a user