diff --git a/.github/workflows/gitea-release.yml b/.github/workflows/gitea-release.yml index 3ec4ac9..abfbfa4 100644 --- a/.github/workflows/gitea-release.yml +++ b/.github/workflows/gitea-release.yml @@ -6,6 +6,18 @@ on: GITEA_TOKEN: description: 'Token für Gitea API-Zugriff' required: true + FILAMAN_SSH_PRIVATE_KEY: + description: 'SSH Private Key für Deployment' + required: true + FILAMAN_SSH_HOST: + description: 'SSH Host für Deployment' + required: true + FILAMAN_SSH_USER: + description: 'SSH User für Deployment' + required: true + FILAMAN_SSH_FIRMWARE_PATH: + description: 'SSH Pfad für Firmware Upload' + required: true outputs: version: @@ -212,3 +224,31 @@ jobs: fi fi done + + - name: SSH-Deploy Firmware + if: success() + env: + SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }} + SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }} + SSH_USER: ${{ secrets.FILAMAN_SSH_USER }} + SSH_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }} + VERSION: ${{ steps.get_version.outputs.VERSION }} + run: | + set -euo pipefail + + # SSH-Key einrichten + mkdir -p ~/.ssh + echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts 2>/dev/null + + cd .pio/build/esp32dev + + # Full-Binary per SCP hochladen + echo "📤 Upload filaman_full_${VERSION}.bin per SCP ..." + scp -o StrictHostKeyChecking=no "filaman_full_${VERSION}.bin" "${SSH_USER}@${SSH_HOST}:${SSH_PATH}/filaman_full.bin" + + echo "✅ filaman_full.bin auf ${SSH_HOST}:${SSH_PATH}/ hochgeladen." + + # Aufräumen + rm -f ~/.ssh/id_rsa diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 008bac5..c98e24e 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -6,15 +6,6 @@ on: RELEASE_TOKEN: description: 'GitHub token for release creation' required: true - FTP_PASSWORD: - description: 'FTP Password' - required: false - FTP_USER: - description: 'FTP User' - required: false - FTP_HOST: - description: 'FTP Host' - required: false permissions: contents: write @@ -160,29 +151,3 @@ jobs: echo "Error: No files found to upload" exit 1 fi - - - name: Install lftp - run: sudo apt-get install -y lftp - - - name: Upload Firmware via FTP - 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: | - cd .pio/build/esp32dev - if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then - echo "All FTP credentials are present, attempting upload..." - lftp -c "set ssl:verify-certificate no; \ - set ftp:ssl-protect-data true; \ - set ftp:ssl-force true; \ - set ssl:check-hostname false; \ - 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 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c754794..788c0bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,13 +32,14 @@ jobs: uses: ./.github/workflows/github-release.yml secrets: RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} - FTP_USER: ${{ secrets.FTP_USER }} - FTP_HOST: ${{ secrets.FTP_HOST }} gitea-release: needs: detect-provider if: needs.detect-provider.outputs.provider == 'gitea' uses: ./.github/workflows/gitea-release.yml secrets: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} \ No newline at end of file + GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + FILAMAN_SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }} + FILAMAN_SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }} + FILAMAN_SSH_USER: ${{ secrets.FILAMAN_SSH_USER }} + FILAMAN_SSH_FIRMWARE_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }} \ No newline at end of file