diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 609533d..c16c5df 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -1,12 +1,11 @@ -name: +name: on: push: branches: - main - tags: - - 'v[0-9].[0-9]+.[0-9]+' - + tags: + - "v[0-9].[0-9]+.[0-9]+" jobs: docker-api-stable-build-push: @@ -69,22 +68,27 @@ jobs: deploy-prod: runs-on: ubuntu-latest if: github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/v') - needs: [docker-ui-stable-build-push, docker-api-stable-build-push] + needs: + [ + docker-ui-stable-build-push, + docker-api-stable-build-push, + docker-tasks-stable-build-push, + ] steps: - name: Setup uses: actions/checkout@v4 - - name: SCP new docker compose file + - name: SCP new docker compose file uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.MY_SOLID_APP_VPS_HOST }} username: ${{ secrets.MY_SOLID_APP_VPS_USER }} port: ${{ secrets.MY_SOLID_APP_VPS_PORT }} key: ${{ secrets.MY_SOLID_APP_VPS_SSH_KEY }} - source: 'docker-compose.prod.yml, nginx.prod.conf' - target: '~/' + source: "docker-compose.prod.yml, nginx.prod.conf" + target: "~/" - - name: Deploy new docker containers + - name: Deploy new docker containers uses: appleboy/ssh-action@master with: host: ${{ secrets.MY_SOLID_APP_VPS_HOST }} diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 92c548e..011770b 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -1,6 +1,5 @@ name: - on: push: branches: @@ -63,22 +62,27 @@ jobs: deploy-staging: runs-on: ubuntu-latest - needs: [docker-ui-latest-build-push, docker-api-latest-build-push] + needs: + [ + docker-ui-latest-build-push, + docker-api-latest-build-push, + docker-tasks-latest-build-push, + ] steps: - name: Setup uses: actions/checkout@v4 - - name: SCP new docker compose file + - name: SCP new docker compose file uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.MY_SOLID_APP_STAGING_VPS_HOST }} username: ${{ secrets.MY_SOLID_APP_STAGING_VPS_USER }} port: ${{ secrets.MY_SOLID_APP_STAGING_VPS_PORT }} key: ${{ secrets.MY_SOLID_APP_STAGING_VPS_SSH_KEY }} - source: 'docker-compose.staging.yml, nginx.staging.conf' - target: '~/' + source: "docker-compose.staging.yml, nginx.staging.conf" + target: "~/" - - name: Deploy new docker containers + - name: Deploy new docker containers uses: appleboy/ssh-action@master with: host: ${{ secrets.MY_SOLID_APP_STAGING_VPS_HOST }}