Compare commits
No commits in common. "df1b87465c87516f90e13eddd12f491658a9adb6" and "975845421b1490e5a172be08fd5454d9c77c2afe" have entirely different histories.
df1b87465c
...
975845421b
40
.github/workflows/gitea-release.yml
vendored
40
.github/workflows/gitea-release.yml
vendored
@ -15,16 +15,10 @@ on:
|
|||||||
FTP_HOST:
|
FTP_HOST:
|
||||||
description: 'FTP Host for firmware upload'
|
description: 'FTP Host for firmware upload'
|
||||||
required: true
|
required: true
|
||||||
outputs:
|
|
||||||
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:
|
||||||
@ -218,13 +212,6 @@ jobs:
|
|||||||
- name: Install lftp
|
- name: Install lftp
|
||||||
run: sudo apt-get install -y lftp
|
run: sudo apt-get install -y lftp
|
||||||
|
|
||||||
- name: Debug Secrets
|
|
||||||
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:
|
env:
|
||||||
@ -233,24 +220,13 @@ jobs:
|
|||||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||||
run: |
|
run: |
|
||||||
echo "Environment variables:"
|
echo ${{ secrets.FTP_USER }}
|
||||||
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
|
||||||
if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
|
lftp -c "set ssl:verify-certificate no; \
|
||||||
echo "All FTP credentials are present, attempting upload..."
|
set ftp:ssl-protect-data true; \
|
||||||
lftp -c "set ssl:verify-certificate no; \
|
set ftp:ssl-force true; \
|
||||||
set ftp:ssl-protect-data true; \
|
set ssl:check-hostname false; \
|
||||||
set ftp:ssl-force true; \
|
set ftp:ssl-auth TLS; \
|
||||||
set ssl:check-hostname false; \
|
open -u ${{ secrets.FTP_USER }},${{ secrets.FTP_PASSWORD }} ${{ secrets.FTP_HOST }}; \
|
||||||
set ftp:ssl-auth TLS; \
|
put -O / filaman_full_${{ steps.get_version.outputs.VERSION }}.bin -o filaman_full.bin"
|
||||||
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
|
|
@ -1,13 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [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
|
## [1.3.86] - 2025-02-23
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.86
|
- update webpages for version v1.3.86
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.87"
|
version = "1.3.86"
|
||||||
##
|
##
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user