Merge pull request 'woutervermeer-patch-5' (#11) from woutervermeer-patch-5 into pre-prod
All checks were successful
Gitea build & Test. / tests (push) Successful in 6s
Gitea build & Test. / tests (pull_request) Successful in 5s

Reviewed-on: woutervermeer/Quatsh-Website#11
This commit was merged in pull request #11.
This commit is contained in:
2026-03-08 14:31:30 +00:00
3 changed files with 3 additions and 5 deletions

View File

@@ -3,7 +3,6 @@ run-name: ${{ gitea.actor }}
on: on:
push: push:
branches: branches:
- main
- pre-prod - pre-prod
pull_request: pull_request:

View File

@@ -2,14 +2,13 @@ name: Deploy to production
run-name: deploy-${{ gitea.actor }} run-name: deploy-${{ gitea.actor }}
on: on:
merge: push:
branches: branches:
- main - main
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: tests # require tests to pass
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@@ -24,7 +23,7 @@ jobs:
- name: Deploy - name: Deploy
run: | run: |
ssh -i ~/.ssh/id_rsa ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOF' ssh -i ~/.ssh/id_rsa ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOF'
cd /path/to/Quatsh-Website cd ~/Quatsh-Website
echo "Pulling latest code..." echo "Pulling latest code..."
git pull origin main git pull origin main

View File

@@ -1,6 +1,6 @@
prod: prod:
docker compose down docker compose down
docker compose -f ./compose.yaml -f ./compose.prod.yaml up --build docker compose -f ./compose.yaml -f ./compose.prod.yaml up -d --build
dev: dev:
docker compose down docker compose down