Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions .github/workflows/deploy_prod.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/deploy_staging.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name:


on:
push:
branches:
Expand Down Expand Up @@ -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 }}
Expand Down