feat: Update deployment scripts to use git fetch and reset for more reliable state management
This commit is contained in:
parent
bd694b30a6
commit
952cb90973
|
|
@ -13,7 +13,8 @@ jobs:
|
|||
set -e
|
||||
echo "=== Deploying to DEVELOPMENT ==="
|
||||
cd /home/lars/docker/bodytrack-dev
|
||||
git pull origin develop
|
||||
git fetch origin develop
|
||||
git reset --hard origin/develop
|
||||
docker compose -f docker-compose.dev-env.yml build --no-cache
|
||||
docker compose -f docker-compose.dev-env.yml up -d
|
||||
sleep 5
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ jobs:
|
|||
set -e
|
||||
echo "=== Deploying to PRODUCTION ==="
|
||||
cd /home/lars/docker/bodytrack
|
||||
git pull origin main
|
||||
# Arbeitskopie = exakt origin/main (vermeidet Abbruch bei lokalem package-lock o. ä.)
|
||||
git fetch origin main
|
||||
git reset --hard origin/main
|
||||
docker compose -f docker-compose.yml build --no-cache
|
||||
docker compose -f docker-compose.yml up -d
|
||||
sleep 5
|
||||
|
|
|
|||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -64,4 +64,5 @@ tmp/
|
|||
|
||||
# Cursor MCP mit Secrets (Example: .cursor/mcp.json.example)
|
||||
.cursor/mcp.json
|
||||
.claude/settings.local.jsonfrontend/package-lock.json
|
||||
.claude/settings.local.json
|
||||
frontend/package-lock.json
|
||||
|
|
|
|||
|
|
@ -508,8 +508,8 @@ export default function Analysis() {
|
|||
{/* ── Analysen starten ── */}
|
||||
{tab==='run' && (
|
||||
<div>
|
||||
{/* Fresh result shown immediately */}
|
||||
{newResult && (
|
||||
{/* Fallback: Ergebnis oben nur wenn keine Pipeline-Split-Ansicht (z. B. keine Prompts) */}
|
||||
{newResult && !(canUseAI && pipelinePrompts.length > 0) && (
|
||||
<div style={{marginBottom:16}}>
|
||||
<div style={{fontSize:12,fontWeight:600,color:'var(--accent)',marginBottom:8}}>
|
||||
✅ Neue Analyse erstellt:
|
||||
|
|
@ -565,6 +565,19 @@ export default function Analysis() {
|
|||
</nav>
|
||||
</div>
|
||||
<div className="analysis-split__main">
|
||||
{newResult && (
|
||||
<div style={{ marginBottom: 20 }}>
|
||||
<div style={{ fontSize: 12, fontWeight: 600, color: 'var(--accent)', marginBottom: 8 }}>
|
||||
✅ Neue Analyse erstellt:
|
||||
</div>
|
||||
<InsightCard
|
||||
ins={{ ...newResult, created: new Date().toISOString() }}
|
||||
onDelete={deleteInsight}
|
||||
defaultOpen={true}
|
||||
prompts={prompts}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{activeCategoryKey && (() => {
|
||||
const group = pipelineGroups.find(g => g.categoryKey === activeCategoryKey)
|
||||
if (!group?.prompts?.length) return null
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user