Skip to content
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.

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

fix(apollo-mock-server): update package graphql-tag (v14.x) #1767

Merged
merged 2 commits into from
Apr 27, 2021

Conversation

hops-release-bot[bot]
Copy link

⚠️ This PR is the successor of #1765 and has been created automatically because the previous PR's commits could not be cherry-picked. ⚠️

Please resolve the conflicts and merge this PR afterwards by running the following command:

git fetch origin && \
git fetch origin pull/1765/head && \
git checkout update-graphql-tag-v14.x && \
git reset --hard HEAD^ && \
git cherry-pick daaab4491f71af7a5ccf9f9d1d90f658f3653f56 2242e528f5d4e1ca1e7901231a51ebe98dcbf975

After successfully resolving all conflicts, you need to force-push your changes.

git push --force origin update-graphql-tag-v14.x

...manually, because the Apollo team published the v2.12.x packages with tag next,
so Renovate will not bother to create an update PR for us.

Bors merge bot cheat sheet

We are using bors-ng to automate merging of our pull requests. The following table provides a summary of commands that are available to reviewers (members of this repository with push access) and delegates (in case of bors delegate+ or bors delegate=[list]).

Syntax Description
bors merge Run the test suite and push to master if it passes. Short for "reviewed: looks good."
bors merge- Cancel an r+, r=, merge, or merge=
bors try Run the test suite without pushing to master.
bors try- Cancel a try
bors delegate+ Allow the pull request author to merge their changes.
bors delegate=[list] Allow the listed users to r+ this pull request's changes.
bors retry Run the previous command a second time.

This is a short collection of opinionated commands. For a full list of the commands read the bors reference.

@hops-release-bot hops-release-bot bot added the 📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging. label Apr 27, 2021
Emanuel Kluge added 2 commits April 27, 2021 09:43
...manually, because the Apollo team published the v2.12.x packages with tag `next`,
so Renovate will not bother to create an update PR for us.
...to fix the current version resolution issue in transient dependencies, too
@herschel666 herschel666 marked this pull request as ready for review April 27, 2021 07:44
Copy link
Contributor

@herschel666 herschel666 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

@bors
Copy link
Contributor

bors bot commented Apr 27, 2021

Build succeeded:

@bors bors bot merged commit 0cfad7b into release-bot/next-v14.x Apr 27, 2021
@bors bors bot deleted the update-graphql-tag-v14.x branch April 27, 2021 08:06
@hops-release-bot hops-release-bot bot mentioned this pull request Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant