From dd60d1a1c4a2028281ffa37548b7c3647e7b74cb Mon Sep 17 00:00:00 2001 From: Untone Date: Fri, 1 Nov 2024 14:33:34 +0300 Subject: [PATCH] deployfix --- .gitea/workflows/main.yml | 18 ------------------ .github/workflows/deploy.yml | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 4bc033fb..935386fd 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -25,15 +25,6 @@ jobs: git_remote_url: 'ssh://dokku@v2.discours.io:22/discoursio-api' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Check UPLOADER is running - id: check_container - uses: appleboy/ssh-action@master - with: - host: staging.discours.io - username: dokku - key: ${{ secrets.SSH_PRIVATE_KEY }} - script: ps:report uploader | grep 'Processes:' | awk '{print $2}' | grep '^1$' - - name: Push to dokku for dev branch if: github.ref == 'refs/heads/dev' && steps.check_container.outcome == 'success' uses: dokku/github-action@master @@ -42,12 +33,3 @@ jobs: force: true git_remote_url: 'ssh://dokku@staging.discours.io:22/core' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} - - - name: Restart AUTHORIZER - id: restart_authorizer - uses: appleboy/ssh-action@master - with: - host: staging.discours.io - username: dokku - key: ${{ secrets.SSH_PRIVATE_KEY }} - script: ps:restart authorizer diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 38ff704c..5ccba1e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,11 +17,11 @@ jobs: - uses: webfactory/ssh-agent@v0.8.0 with: - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-private-key: ${{ github.action.secrets.SSH_PRIVATE_KEY }} - name: Push to dokku env: - HOST_KEY: ${{ secrets.HOST_KEY }} + HOST_KEY: ${{ github.action.secrets.HOST_KEY }} run: | echo $HOST_KEY > ~/.ssh/known_hosts git remote add dokku dokku@v2.discours.io:discoursio-api