From 7d1d740f82eae6df5b46cc495cde50c338f1126e Mon Sep 17 00:00:00 2001 From: Xyon Date: Tue, 8 Oct 2024 19:48:05 +0100 Subject: [PATCH] Fuck it, refactor the whole fucking thing --- .gitea/workflows/deploy.yaml | 22 ++++++++++++++++------ cicd/deploy.sh | 9 --------- 2 files changed, 16 insertions(+), 15 deletions(-) delete mode 100755 cicd/deploy.sh diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 4faedfb..3e51ed2 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -50,9 +50,19 @@ jobs: WEATHER_API_KEY: ${{ secrets.WEATHER_API_KEY }} DOGPICS_API_KEY: ${{ secrets.DOGPICS_API_KEY }} CATPICS_API_KEY: ${{ secrets.CATPICS_API_KEY }} - - name: Create SSH dir - run: mkdir -pv ~/.ssh - - name: Seed SSH key for deploy - run: echo "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_rsa && chmod 0600 ~/.ssh/id_rsa - - name: Deploy - run: bash cicd/deploy.sh ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }} + - name: ssh-scp-ssh-pipelines + uses: cross-the-world/ssh-scp-ssh-pipelines@v1 + env: + BOT_NAME: ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }} + with: + host: ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }} + user: badgey + key: ${{ secrets.DEPLOY_KEY }} + first_ssh: | + sudo /usr/bin/systemctl stop $BOT_NAME + scp: | + ./badgey => /srv/$BOT_NAME/$BOT_NAME + ./config => /srv/$BOT_NAME/ + ./txt => /srv/$BOT_NAME/ + last_ssh: | + sudo /usr/bin/systemctl start $BOT_NAME diff --git a/cicd/deploy.sh b/cicd/deploy.sh deleted file mode 100755 index 2f0c078..0000000 --- a/cicd/deploy.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -bot=$1 - -ssh badgey@$bot sudo /usr/bin/systemctl stop $bot -rsync -avP badgey badgey@$bot:/srv/$bot/ -rsync -avP config badgey@$bot:/srv/$bot/ -rsync -avP txt badgey@$bot:/srv/$bot/ -ssh badgey@$bot sudo /usr/bin/systemctl start $bot \ No newline at end of file