Skip to content

Conversation

mongodb-drivers-pr-bot[bot]
Copy link
Contributor

Merge new changes from release/1.17 into release/2.2.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge release/2.2

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to release/2.2 and manually merge using the `ours` merge strategy:
git reset --hard release/2.2
git merge --strategy=ours release/1.17

Then, push the temporary branch to upate the pull request.

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot requested a review from a team as a code owner September 3, 2025 21:40
@github-actions github-actions bot added review-priority-normal Medium Priority PR for Review: within 1 business day dependencies Pull requests that update a dependency file documentation Pull requests that update documentation or examples labels Sep 3, 2025
@prestonvasquez prestonvasquez force-pushed the merge-release/1.17-into-release/2.2-1756935613821 branch 5 times, most recently from bd8b13d to 8c336ff Compare September 4, 2025 14:55
@mongodb mongodb deleted a comment from mongodb-drivers-pr-bot bot Sep 4, 2025
Copy link
Contributor Author

API Change Report

No changes found!


functions:
assume-test-secrets-ec2-role:
assume-test-secrets-ec2-role:
Copy link
Member

Choose a reason for hiding this comment

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

The yml language server removed these empty spaces while resolving conflicts.

- id: markdown-link-check
exclude: ^(vendor)
# Retry when the endpoint returns HTTP 429 (Too Many Requests)
args: [-r]
Copy link
Member

@prestonvasquez prestonvasquez Sep 4, 2025

Choose a reason for hiding this comment

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

@matthewdale This solution doesn't appear to always resolve the blogspot HTTP 429 issue. markdown-lint-check has a specific retryOn429 option that they recommend using. From the related docs:

retryOn429: if this is true then retry request when response is an HTTP code 429 after the duration indicated by retry-after header.

This will require giving the hook a config file .markdown-link-check-config.json:

{
	"retryOn429": true,
	"retryCount": 5,
	"fallbackRetryDelay": "60s"
}
- id: markdown-link-check
  exclude: ^(vendor)
  # Retry when the endpoint returns HTTP 429 (Too Many Requests)
  args: ["-c", ".markdown-link-check-config.json"]

auto-merge was automatically disabled September 4, 2025 18:26

Pull request was closed

@prestonvasquez prestonvasquez force-pushed the merge-release/1.17-into-release/2.2-1756935613821 branch from 24ca434 to b41edf6 Compare September 4, 2025 18:26
Copy link

There is an existing patch(es) for this commit SHA:

Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'.

@prestonvasquez
Copy link
Member

prestonvasquez commented Sep 4, 2025

@matthewdale This PR was automatically closed after ignoring changes:

git reset --hard release/2.2
git merge --strategy=ours release/1.17

We are ignoring the changes since the -r is flakey (opting for an ignore-429s solution) and we don't want to pin DET for 2.x branches.

@alcaeus alcaeus deleted the merge-release/1.17-into-release/2.2-1756935613821 branch September 22, 2025 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file documentation Pull requests that update documentation or examples review-priority-normal Medium Priority PR for Review: within 1 business day

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant