Compare commits
36 Commits
v1.3.76
...
b38e3fa5ef
Author | SHA1 | Date | |
---|---|---|---|
b38e3fa5ef | |||
5280d7e341 | |||
2f95c66d39 | |||
df1b87465c | |||
84f1420999 | |||
b14dd5475d | |||
975845421b | |||
044ddbe0eb | |||
c385544d67 | |||
c6cfd85687 | |||
84632322e2 | |||
86e55a8696 | |||
d2b40daaca | |||
9d58cbc31c | |||
d09aeaf47c | |||
9fb82fe51e | |||
5e0e2c5f6b | |||
a8460503ff | |||
6700a1761f | |||
7207f36e06 | |||
e79bee3381 | |||
c3918f075b | |||
0c384219c5 | |||
42b9daf4be | |||
13a771682f | |||
f79f87bf09 | |||
9fe3f6c0ff | |||
55e89948bb | |||
6c5e8c4d07 | |||
4f79700d74 | |||
1b4fecf409 | |||
89a6101d97 | |||
ee45a74fee | |||
db365aba3c | |||
63cdfaee6c | |||
eb2e360c35 |
61
.github/workflows/gitea-release.yml
vendored
61
.github/workflows/gitea-release.yml
vendored
@ -6,13 +6,17 @@ on:
|
|||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
description: 'Token für Gitea API-Zugriff'
|
description: 'Token für Gitea API-Zugriff'
|
||||||
required: true
|
required: true
|
||||||
FTP_PASSWORD:
|
|
||||||
description: 'FTP Password for firmware upload'
|
outputs:
|
||||||
required: true
|
version:
|
||||||
|
description: 'The version that was released'
|
||||||
|
value: ${{ jobs.create-release.outputs.version }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
create-release:
|
create-release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.get_version.outputs.VERSION }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
@ -203,18 +207,47 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Install ncftp
|
- name: Install lftp
|
||||||
run: sudo apt-get install -y ncftp
|
run: sudo apt-get install -y lftp
|
||||||
|
|
||||||
|
- name: Debug Secrets
|
||||||
|
env:
|
||||||
|
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
||||||
|
FTP_USER: ${{ secrets.FTP_USER }}
|
||||||
|
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||||
|
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||||
|
run: |
|
||||||
|
echo "Check if secrets are defined:"
|
||||||
|
if [ -n "${{ secrets.FTP_USER }}" ]; then echo "FTP_USER is defined"; else echo "FTP_USER is empty"; fi
|
||||||
|
if [ -n "${{ secrets.FTP_PASSWORD }}" ]; then echo "FTP_PASSWORD is defined"; else echo "FTP_PASSWORD is empty"; fi
|
||||||
|
if [ -n "${{ secrets.FTP_HOST }}" ]; then echo "FTP_HOST is defined"; else echo "FTP_HOST is empty"; fi
|
||||||
|
|
||||||
- name: Upload Firmware via FTP
|
- name: Upload Firmware via FTP
|
||||||
if: success()
|
if: success()
|
||||||
|
env:
|
||||||
|
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
||||||
|
FTP_USER: ${{ secrets.FTP_USER }}
|
||||||
|
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||||
|
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||||
run: |
|
run: |
|
||||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
echo "Environment variables:"
|
||||||
|
env | grep -E '^FTP_' | while read -r line; do
|
||||||
|
var_name=$(echo "$line" | cut -d= -f1)
|
||||||
|
var_value=$(echo "$line" | cut -d= -f2-)
|
||||||
|
echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
|
||||||
|
done
|
||||||
|
|
||||||
cd .pio/build/esp32dev
|
cd .pio/build/esp32dev
|
||||||
curl --ftp-ssl-reqd \
|
if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
|
||||||
--ftp-ssl-control \
|
echo "All FTP credentials are present, attempting upload..."
|
||||||
--ssl-reqd \
|
lftp -c "set ssl:verify-certificate no; \
|
||||||
--insecure \
|
set ftp:ssl-protect-data true; \
|
||||||
--user "${{ secrets.FTP_USER }}:${{ secrets.FTP_PASSWORD }}" \
|
set ftp:ssl-force true; \
|
||||||
-T "filaman_full_${VERSION}.bin" \
|
set ssl:check-hostname false; \
|
||||||
"ftps://filaman.app:21/filaman_full.bin"
|
set ftp:ssl-auth TLS; \
|
||||||
|
open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
|
||||||
|
put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
|
||||||
|
else
|
||||||
|
echo "Error: Some FTP credentials are missing"
|
||||||
|
exit 1
|
||||||
|
fi
|
96
CHANGELOG.md
96
CHANGELOG.md
@ -1,5 +1,101 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.88] - 2025-02-23
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.88
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- update Gitea release workflow to use secrets for FTP credentials
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.87] - 2025-02-23
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.87
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- enhance FTP upload workflow with credential checks and version output
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.86] - 2025-02-23
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.86
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- streamline FTP credentials usage in Gitea release workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.85] - 2025-02-23
|
||||||
|
### Added
|
||||||
|
- add FTP_USER variable for Gitea release workflow
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.85
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.84] - 2025-02-23
|
||||||
|
### Added
|
||||||
|
- add FTP_HOST variable for firmware upload in Gitea release workflow
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.84
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.83] - 2025-02-23
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.83
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- correct variable interpolation for FTP credentials in Gitea release workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.82] - 2025-02-23
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow to use variable interpolation for FTP credentials
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.82
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.81] - 2025-02-23
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow to use environment variables for FTP credentials and version
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.81
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.80] - 2025-02-23
|
||||||
|
### Added
|
||||||
|
- add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.80
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.79] - 2025-02-23
|
||||||
|
### Added
|
||||||
|
- add FTP_USER input for firmware upload in Gitea release workflow
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.79
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.78] - 2025-02-23
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.78
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- change FTP protocol from FTPS to FTP for file upload in workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.77] - 2025-02-23
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.77
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- replace ncftp with lftp for secure firmware upload
|
||||||
|
|
||||||
|
|
||||||
## [1.3.76] - 2025-02-23
|
## [1.3.76] - 2025-02-23
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.76
|
- update webpages for version v1.3.76
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.76"
|
version = "1.3.88"
|
||||||
##
|
##
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Reference in New Issue
Block a user