Skip to content

Commit 9316b60

Browse files
authored
fix: rebase fix and dynamic head_ref for target branch
- so we checked that the rebase was actually stupid as it was rebasing to itself... Now it rebases to main - also after validation of functioning with hardcoded target branch, let's switch to dynamic head_ref to make sure we actually push the docs to the current PR branch, whatever that may be.
1 parent ff490ea commit 9316b60

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/add-docs-to-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030

3131
- name: Fetch and rebase onto latest main
3232
run: |
33-
git fetch origin changeset-release/main
34-
git rebase origin/changeset-release/main
33+
git fetch origin main
34+
git rebase origin/main
3535
3636
- name: Build packages
3737
run: pnpm build:packages
@@ -45,4 +45,4 @@ jobs:
4545
git config user.email "github-actions[bot]@users.noreply.github.com"
4646
git add docs
4747
git commit -m "chore: update docs [skip ci]" || echo "No changes to commit"
48-
git push origin HEAD:changeset-release/main --force-with-lease
48+
git push origin HEAD:${GITHUB_HEAD_REF} --force-with-lease

0 commit comments

Comments
 (0)