Compare commits

...

11 Commits

Author SHA1 Message Date
c165c03579 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
2026-03-08 14:31:30 +00:00
badf0dde7a Update Makefile
All checks were successful
Gitea build & Test. / tests (pull_request) Successful in 5s
2026-03-08 14:31:15 +00:00
b1f25ebcc3 Merge pull request 'Update .gitea/workflows/deploy.yml' (#10) from woutervermeer-patch-5 into main
Some checks failed
Deploy to production / deploy (push) Has been cancelled
Reviewed-on: woutervermeer/Quatsh-Website#10
2026-03-08 14:30:03 +00:00
01c8640d38 Update .gitea/workflows/deploy.yml
All checks were successful
Gitea build & Test. / tests (pull_request) Successful in 7s
2026-03-08 14:29:55 +00:00
f511599273 Merge pull request 'Update .gitea/workflows/deploy.yml' (#9) from woutervermeer-patch-4 into main
All checks were successful
Deploy to production / deploy (push) Successful in 4s
Reviewed-on: woutervermeer/Quatsh-Website#9
2026-03-08 14:23:11 +00:00
bac4c56485 Update .gitea/workflows/deploy.yml
All checks were successful
Gitea build & Test. / tests (pull_request) Successful in 6s
2026-03-08 14:23:03 +00:00
e1a6e4f21f Merge pull request 'Update .gitea/workflows/build_test.yaml' (#8) from woutervermeer-patch-3 into main
Some checks failed
Deploy to production / deploy (push) Has been cancelled
Reviewed-on: woutervermeer/Quatsh-Website#8
2026-03-08 14:22:40 +00:00
2f1102bebc Update .gitea/workflows/build_test.yaml
All checks were successful
Gitea build & Test. / tests (pull_request) Successful in 6s
2026-03-08 14:22:31 +00:00
f24bf52136 Merge pull request 'Update .gitea/workflows/deploy.yml' (#7) from woutervermeer-patch-1 into main
Some checks failed
Gitea build & Test. / tests (push) Successful in 6s
Deploy to production / deploy (push) Has been cancelled
Reviewed-on: woutervermeer/Quatsh-Website#7
2026-03-08 14:19:53 +00:00
0f98959d37 Update .gitea/workflows/deploy.yml
All checks were successful
Gitea build & Test. / tests (pull_request) Successful in 6s
2026-03-08 14:19:44 +00:00
e99f44d8ad Merge pull request 'pre-prod' (#6) from pre-prod into main
All checks were successful
Gitea build & Test. / tests (push) Successful in 6s
Reviewed-on: woutervermeer/Quatsh-Website#6
2026-03-08 14:18:31 +00:00
3 changed files with 3 additions and 5 deletions

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
prod:
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:
docker compose down