diff --git a/.gitea/workflows/code-analysis.yml b/.gitea/workflows/code-analysis.yml index 3742069..bbbe5cf 100644 --- a/.gitea/workflows/code-analysis.yml +++ b/.gitea/workflows/code-analysis.yml @@ -12,6 +12,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + cache: npm + - name: Workspace sanity check run: | echo "PWD: $(pwd)" diff --git a/deploy-production.sh b/deploy-production.sh index f23c38c..440a2aa 100755 --- a/deploy-production.sh +++ b/deploy-production.sh @@ -137,7 +137,18 @@ git clean -fd \ # Pull latest changes echo " Pulling latest changes..." -git pull +if ! git pull --ff-only; then + echo "ERROR: git pull fehlgeschlagen." + echo "" + echo "Häufige Ursache: SSH-Key für den aktuellen User fehlt." + echo "Prüfen:" + echo " ssh -T git@tsschulz.de" + echo "" + echo "Optional auf HTTPS wechseln:" + echo " git remote set-url origin https://tsschulz.de//.git" + echo "Oder SSH-Key für User $(id -un) hinterlegen." + exit 1 +fi # Reset any accidental changes from stash restore (should be none now) git reset --hard HEAD >/dev/null 2>&1