adamf/web_server
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Use fetch+reset in deploy workflow to avoid merge conflicts
All checks were successful
Deploy with Docker Compose / deploy (push) Successful in 48s
Details

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Adam French
2026-04-07 13:40:08 +01:00
parent 258d97757c
commit 2e3d5f4dbe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/deploy.yaml
View File

@@ -14,7 +14,8 @@ jobs:
GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no" GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no"
run: | run: |
git config --global --add safe.directory /home/adamf/deploy/web_server git config --global --add safe.directory /home/adamf/deploy/web_server
git pull ssh://git@localhost:2222/adamf/web_server.git main git fetch ssh://git@localhost:2222/adamf/web_server.git main
git reset --hard FETCH_HEAD
- name: Run docker compose up - name: Run docker compose up
working-directory: /home/adamf/deploy/web_server working-directory: /home/adamf/deploy/web_server