From 89b8e68079444822d8bd3d385dbdb7c9e871a62f Mon Sep 17 00:00:00 2001 From: Jerry Gamblin Date: Tue, 28 Apr 2026 15:15:20 -0500 Subject: [PATCH] fix(ci): use --autostash on daily forecast rebase The forecast run writes files outside the five we explicitly stage (e.g., code/cna_count_cache.json), leaving the working tree dirty after `git commit`. That tripped `git pull --rebase` with "cannot pull with rebase: You have unstaged changes." Adding --autostash lets rebase handle the dirty tree. Co-Authored-By: Claude Opus 4.7 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d13c1d8..9e9845e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: run: | git add web/data.json web/cna_data.json web/forecast_history.json web/pipeline_results.json web/model_info.json || true git commit -m "Update CVE forecast data - $(date -u '+%Y-%m-%d %H:%M:%S UTC')" - git pull --rebase origin main + git pull --rebase --autostash origin main git push - name: Upload artifacts