Skip to content

Sync PR head with microsoft/typespec main before regeneration #47770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msyyc merged 3 commits into from
Jun 30, 2026
Merged

Sync PR head with microsoft/typespec main before regeneration #47770

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ec7c54
Sync PR head with microsoft/typespec main before regeneration
msyyc Jun 30, 2026
8e92a19
Merge branch 'main' into typespec-regen-sync-main
msyyc Jun 30, 2026
6990dad
Use if-then-else for upstream remote setup (shellcheck SC2015)
msyyc Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/typespec-python-regenerate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,31 @@ jobs:
path: _typespec
fetch-depth: 0

- name: Sync PR head with microsoft/typespec main
# Only relevant for PR-sourced runs. Merging main into the PR head
# ensures the regenerated diff reflects only the PR's changes on top of
# current main, rather than including changes the PR is simply behind on.
if: steps.typespec-info.outputs.typespec_pr_number != ''
working-directory: _typespec
run: |
set -euo pipefail
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
# The checkout's "origin" points at the PR head repo (possibly a
# fork), so add microsoft/typespec explicitly to fetch its main.
if git remote get-url upstream >/dev/null 2>&1; then
git remote set-url upstream https://github.com/microsoft/typespec.git
else
git remote add upstream https://github.com/microsoft/typespec.git
fi
git fetch --no-tags upstream main
if ! git merge --no-edit upstream/main; then
git merge --abort || true
echo "::error::microsoft/typespec PR #${{ steps.typespec-info.outputs.typespec_pr_number }} conflicts with microsoft/typespec main. Please update the PR branch by merging (or rebasing onto) the latest main and resolving the conflicts, then re-run this workflow."
exit 1
fi
echo "::notice::Merged microsoft/typespec main into PR head ($(git rev-parse --short HEAD))"

- name: Setup Node.js
# SHA corresponds to actions/setup-node@v6
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
Expand Down
Loading