diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 2f253a5..93d9330 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -55,19 +55,15 @@ jobs: # Install dependencies, build, and generate site output pnpm i && pnpm build - - name: 🚀 Deploy files via SFTP - continue-on-error: true - uses: pressidium/lftp-mirror-action@v1 - with: - host: ${{ secrets.FTP_HOST }} - port: ${{ secrets.FTP_PORT || 21 }} - user: ${{ secrets.FTP_USERNAME }} - pass: ${{ secrets.FTP_PASSWORD }} - onlyNewer: true - restoreMTime: false - parallel: '3' - settings: 'sftp:auto-confirm=yes' - localDir: 'dist' - remoteDir: '/share/new-website' - options: '--verbose' + - name: 🔑 Set up SSH Key + run: | + echo "$SSH_PRIVATE_KEY" > /tmp/id_rsa + chmod 600 /tmp/id_rsa + ssh-add /tmp/id_rsa + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: 🚀 Deploy Changed Files via rsync + run: | + rsync -avz --delete -e "ssh -p ${SSH_PORT}" ./dist/ ${SSH_USER}@${SSH_HOST}:${REMOTE_DIR} diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..9c1044f --- /dev/null +++ b/.prettierrc @@ -0,0 +1,3 @@ +{ + "bracketSameLine": true +} diff --git a/Dockerfile b/Dockerfile index 5c8fe3a..21ac9b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ RUN apk add --no-cache \ git \ git-lfs \ tar \ + rsync \ + openssh \ bash # Install PNPM globally diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index e4d9067..30227f2 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -70,23 +70,6 @@ import "./global.css"; } catch (e) {} })(); - - -
-
-
- -
- + + +
+
+
+ +
+