Skip to content

Commit 13ccd7d

Browse files
committed
fix(ci): rebase before pushing release commit
1 parent 5b82af7 commit 13ccd7d

6 files changed

Lines changed: 1060 additions & 1 deletion

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,13 @@ jobs:
9090
if [ -z "${BRANCH}" ]; then
9191
BRANCH="main"
9292
fi
93-
git push origin "HEAD:${BRANCH}"
93+
git fetch origin "${BRANCH}"
94+
git rebase "origin/${BRANCH}"
95+
if ! git push origin "HEAD:${BRANCH}"; then
96+
git fetch origin "${BRANCH}"
97+
git rebase "origin/${BRANCH}"
98+
git push origin "HEAD:${BRANCH}"
99+
fi
94100
- name: Tag release
95101
if: steps.auto_changeset.outputs.has_changeset == 'true' && github.actor != 'github-actions[bot]'
96102
shell: bash

.knowledge/.codex/sessions/2026/01/21/rollout-2026-01-21T15-12-40-019be041-b300-7b02-b4e9-53d940349352.jsonl

Lines changed: 741 additions & 0 deletions
Large diffs are not rendered by default.

.knowledge/.codex/sessions/2026/01/21/rollout-2026-01-21T18-15-35-019be0e9-2a39-7071-8917-ebc1068440ed.jsonl

Lines changed: 9 additions & 0 deletions
Large diffs are not rendered by default.

.knowledge/.codex/sessions/2026/01/21/rollout-2026-01-21T18-15-35-019be0e9-2b3b-75f2-8f39-123754d65c0c.jsonl

Lines changed: 13 additions & 0 deletions
Large diffs are not rendered by default.

.knowledge/.codex/sessions/2026/01/21/rollout-2026-01-21T18-16-27-019be0e9-f4a7-7d03-8b2d-e5890d6074f2.jsonl

Lines changed: 260 additions & 0 deletions
Large diffs are not rendered by default.

.knowledge/.codex/sessions/2026/01/21/rollout-2026-01-21T18-16-27-019be0e9-f542-7221-85a3-d708162c2083.jsonl

Lines changed: 30 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)