Merge remote-tracking branch 'origin/main' into beta

This commit is contained in:
Johnnybegood90
2026-03-10 10:18:04 +01:00
+20 -2
View File
@@ -4,13 +4,15 @@ on:
push: push:
branches: branches:
- main - main
- beta
jobs: jobs:
deploy: deploy-main:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Deploy via SSH - name: Deploy production + demo
uses: appleboy/ssh-action@v1 uses: appleboy/ssh-action@v1
with: with:
host: ${{ secrets.SERVER_HOST }} host: ${{ secrets.SERVER_HOST }}
@@ -24,3 +26,19 @@ jobs:
cd ${{ secrets.DEMO_DEPLOY_PATH }} cd ${{ secrets.DEMO_DEPLOY_PATH }}
git fetch origin git fetch origin
git reset --hard origin/main git reset --hard origin/main
deploy-beta:
if: github.ref == 'refs/heads/beta'
runs-on: ubuntu-latest
steps:
- name: Deploy beta
uses: appleboy/ssh-action@v1
with:
host: ${{ secrets.SERVER_HOST }}
username: ${{ secrets.SERVER_USER }}
key: ${{ secrets.SERVER_SSH_KEY }}
script: |
cd ${{ secrets.BETA_DEPLOY_PATH }}
git fetch origin
git reset --hard origin/beta