From 518c99d845d6d547062abf1a546333fd8ed5c328 Mon Sep 17 00:00:00 2001 From: Refringe Date: Sat, 9 Mar 2024 00:29:52 -0500 Subject: [PATCH] Removed the SFTP upload action and wrote my own. --- .gitea/workflows/build.yaml | 17 +++++++---------- Dockerfile.node | 3 ++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 749b012..ee2a91d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -43,7 +43,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-node:1.0.1 + image: refringe/spt-build-node:1.0.2 outputs: build_type: ${{ steps.build-type.outputs.build_type }} steps: @@ -262,7 +262,7 @@ jobs: needs: [check-tag-exists, build-server, build-modules, build-launcher] runs-on: ubuntu-latest container: - image: refringe/spt-build-node:1.0.1 + image: refringe/spt-build-node:1.0.2 steps: - name: Clean Directory run: | @@ -329,14 +329,11 @@ jobs: shell: bash - name: Upload Release to HTTP Source - uses: appleboy/scp-action@v0.1.7 - with: - host: "${{ secrets.SFTP_HOST }}" - username: "${{ secrets.SFTP_USERNAME }}" - password: "${{ secrets.SFTP_PASSWORD }}" - port: "${{ secrets.SFTP_PORT }}" - source: "/workspace/refringe/Build/${{ steps.generate-filename.outputs.filename }}" - target: "/public/" + run: | + cd /workspace/refringe/Build/ + echo "${{ secrets.SFTP_HOST_KEY }}" > known_host + sshpass -p ${{ secrets.SFTP_PASSWORD }} scp -o UserKnownHostsFile=known_host -o StrictHostKeyChecking=yes "/workspace/refringe/Build/${{ steps.generate-filename.outputs.filename }}" ${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:/public + shell: bash - name: Upload Release to Mega id: upload-mega diff --git a/Dockerfile.node b/Dockerfile.node index 51c8286..18c80cf 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -8,8 +8,9 @@ FROM node:20.10.0-bookworm # - zstd (caching action dependancy) # - tree (pretty print build directory structure) # - p7zip-full (the goat) +# - sshpass (for automated SSH authentication) RUN apt-get update && \ - apt-get install -y wget git git-lfs zstd tree p7zip-full && \ + apt-get install -y wget git git-lfs zstd tree p7zip-full sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*