Skip to content

Sync main → develop (resolve conflicts) #295

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

Jump to bottom
Merged
merged 25 commits into from
Aug 26, 2025
Merged

Sync main → develop (resolve conflicts) #295

merged 25 commits into from
Aug 26, 2025

Conversation

@apollo-bot2
Copy link
Contributor

Opened from a copy of so conflicts can be resolved without pushing to a protected branch.

esilverm and others added 21 commits August 20, 2025 10:26
@esilverm
add apollo open source and rust toolchain channel extensions
4b93d1e
@esilverm
add nix maintenance support and comment about how it is in beta
462b765
@esilverm
add commas to fix errors from dry-run
966b024
@esilverm
Merge pull request #273 from apollographql/evan/configure-renovate
692e5bf 
Configure Renovate
@mabuyo
change wording around mcp auth spec
ad66be2
@DaleSeo
fix: generate openAI-compatible json schemas for list types
b437692
@mabuyo
Merge pull request #279 from apollographql/mm/fix-auth-wording
f5fa993 
docs: clarify details for auth implementation
@DaleSeo
chore: add changeset
04cee88
@DaleSeo
test: update test snapshots after OpenAI compatibility fix
ee83b8c
@DaleSeo
refactor: use schema_factory consistently
a0efb1e
@DaleSeo
test: add tests for input object lists
3f2c5f6
@DaleSeo
test: revert the unrelated changes in custom_scalar_map.rs
fca294f
@DaleSeo
Merge pull request #272 from apollographql/GT-349
ebc18f1 
fix: generate openAI-compatible json schemas for list types
@alocay
Gt 367 GitHub workflow to merge main into develop (#282) (#284)
adc9c70 
* ci: adding a workflow to autogen main to develop sync pr

* ci: adding a work dispatch trigger for testing

* chore: adjusting bool check for consistency
@DaleSeo
release: v0.7.3
bad5cf2
@DaleSeo
Merge pull request #285 from apollographql/0.7.3
73dc0cd 
release: v0.7.3
@alocay
ci: setting git author in sync workflow to github bot (#286)
3395691 
* ci: setting git author in sync workflow to github bot

* ci: using apollo bot as author
@alocay
ci: using gh cli for PR creation and adding a fallback in case of mer…
d922033 
…ge conflicts (#290)

* ci: using gh cli for PR creation and adding a fallback in case of merge conflicts

* chore: updating rev-list cmd to use right-only
@alocay
ci: fix gh pr create command (#292)
e2efe34
@alocay
ci: fixing bad variable name in comment step (#293)
23d392a
@alocay
ci: opening PR from main instead on conflict (#294)
86355f6
@apollo-bot2 apollo-bot2 added back-merge A PR opened by Apollo bot to sync main and develop automation A PR opened by github workflow automation labels Aug 26, 2025
@apollo-bot2 apollo-bot2 requested a review from a team as a code owner August 26, 2025 19:16
@apollo-bot2 apollo-bot2 added the conflicts A sync PR with conflicts that need to be resolved label Aug 26, 2025
@apollo-bot2 apollo-bot2 requested a review from a team as a code owner August 26, 2025 19:16
@apollo-bot2 apollo-bot2 added back-merge A PR opened by Apollo bot to sync main and develop automation A PR opened by github workflow automation conflicts A sync PR with conflicts that need to be resolved labels Aug 26, 2025
@apollo-librarian
Copy link

apollo-librarian bot commented Aug 26, 2025 •
edited
Loading

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: 744144d402517779b508e865
Build Logs: View logs

@apollographql apollographql deleted a comment from github-actions bot Aug 26, 2025
@apollographql apollographql deleted a comment from github-actions bot Aug 26, 2025
@alocay alocay added the skip-changeset Used when the changeset verification can be skipped label Aug 26, 2025
@apollographql apollographql deleted a comment from github-actions bot Aug 26, 2025
@alocay alocay merged commit d860e7e into develop Aug 26, 2025
8 checks passed
@alocay alocay deleted the conflict/main-into-develop-pr- branch August 26, 2025 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alocay alocay alocay approved these changes

Assignees

No one assigned

Labels

automation A PR opened by github workflow automation back-merge A PR opened by Apollo bot to sync main and develop conflicts A sync PR with conflicts that need to be resolved skip-changeset Used when the changeset verification can be skipped

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@apollo-bot2 @alocay @esilverm @mabuyo @DaleSeo