Promote next branch to dev; make 2.x our default development branch
#6576
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Dylan Anthony <dylan@apollographql.com>
license enforcement now uses the expanded supergraph so we need to ensure that the connect link (serialized as join__directive) ends up in the schema
This commit fixes an issue with a downstream dependency (aws-lc-sys) caused by using an old version of GCC by updating the base CircleCI image to current. This was realistically a long-time coming because the previous tag of stable was deprecated in favor of current back in 2022. Below is a quote from the docker hub page explaining the change to the tag names: current - This image tag points to the latest, production ready base image. This is a replacement for the old stable tag. This image should be used by projects that want a decent level of stability but would like to get occasional software updates. It is typically updated once a month. Co-authored-by: Lenny Burdette <lenny@apollographql.com>
|
CI performance tests
|
|
Merged
Merged
abernix
requested review from
a team,
benjamn,
dariuszkuc,
sachindshinde,
goto-bus-stop,
SimonSapin,
lrlna,
TylerBloom and
duckki
as code owners
|
🎉 |
|
We had to also land #6587, for those who are curious how stacked PRs will behave when you have "delete" branch protection rules in place. ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Router 2.x has been under active development for nearly a year now and the
nextbranch on this repository has been the place in which development has been taking place; while not always obvious, 198 PRs opened on this repository over the last many months (this link may change after this PR merges, but the number is right!) have been targetingnext.During that 2.x development, the
devbranch (the default branch on this repository) has remained the location that 1.x work was taking place. We have continually been merging work fromdev(1.x) intonext(2.x) to ensure relevant work manifests in both places.As work on 2.x is becoming closer to "release ready" and 1.x is getting closer to moving into our "maintenance LTS". This means that the substantive portion of work has pivoted; the vast majority of development is desired to take place on 2.x rather than 1.x and we want to update our branches to reflect that — as has always been the eventual plan.
With that context in mind, the time has come to:
1.xbranchdevbranch become 2.x work (and the new "default" target).To make that outcome true, this PR is the
secondthird ofthreefour steps which we are taking:mainis up to date withdev.devintonext, resolving any merge conflicts to fit into the "2.x outcome" satisfactorily.nextintodevas a true merge, dissolving the (current) existence ofnext(indefinitely for now, though it may be back when 3.x comes around!l) and causing PRs targetingnextto instead re-base themselves ondev.1.xbranch which will be the target for patches which become necessary to land on the 1.x This likely won't manifest as a PR since it'll effectively be pushing a new branch. There will, however, be some manual adjustments to our branch protection rules to enforce protections on that branch which also exist onnextanddev.As noted above, by using this PR to merge
nextintodev, it will automatically re-target all open PRs currently targetingnextto instead be targetingdev, which is the desired outcome since those PRs are improvements to the 2.x line. This will be indirectly be taking advantage of GitHub's stacked PR merging mechanism.