search

apollographql / router

A configurable, high-performance routing runtime for Apollo Federation 🚀
https://www.apollographql.com/docs/router/
Other
800 stars 268 forks source link

Fix small merge conflict between #6031 and #6058 #6066

Closed benjamn closed 2 days ago

benjamn commented 2 days ago

It looks like #6058 updated apollo-compiler to a version where Directive::argument_by_name takes a name and a schema, rather than just a name, and then #6031 (which was passing tests on its own) was merged on top of #6058 without a final rebase/retest, so the build is currently failing on next.

benjamn commented 2 days ago

Thanks @pubmodmatt! It looks like the build error in question has been fixed, but I'll wait for the rest of the checks to pass before squashing.

benjamn commented 2 days ago

Tested locally, so I'll go ahead and squash this with @lennyburdette's suggestion included.