From 593aac9cd65940848b86ef1e72d9a4778181ff5f Mon Sep 17 00:00:00 2001 From: R-Taneja <47066511+R-Taneja@users.noreply.github.com> Date: Fri, 24 Apr 2026 13:36:32 -0700 Subject: [PATCH] fix: avoid pushing upstream history in model sync --- .github/workflows/test-workflow.yml | 7 +++---- .github/workflows/update-vercel-models.yml | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 9f3a01bdb..0a63b3789 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -31,12 +31,11 @@ jobs: - name: Install Dependencies run: bun install - - name: Sync with upstream + - name: Checkout upstream dev run: | git remote add upstream https://github.com/anomalyco/models.dev.git || true - git fetch upstream - git merge upstream/dev --no-edit - git push origin dev + git fetch upstream dev + git checkout -B upstream-dev upstream/dev - name: Generate Vercel models run: bun run vercel:generate --new-only diff --git a/.github/workflows/update-vercel-models.yml b/.github/workflows/update-vercel-models.yml index 8eecae965..bdab1aa23 100644 --- a/.github/workflows/update-vercel-models.yml +++ b/.github/workflows/update-vercel-models.yml @@ -31,14 +31,11 @@ jobs: - name: Install Dependencies run: bun install - - name: Sync with upstream + - name: Checkout upstream dev run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com' git remote add upstream https://github.com/anomalyco/models.dev.git || true - git fetch upstream - git merge upstream/dev --no-edit - git push origin dev + git fetch upstream dev + git checkout -B upstream-dev upstream/dev - name: Generate Vercel models run: bun run vercel:generate --new-only