Skip to content

Merge release/1.17 into v1 #1970

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

Merged
merged 21 commits into from
Mar 4, 2025
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3911a1b
update repo metadata
blink1073 Sep 18, 2024
b7e6686
DEVPROD-10453 Use assume_role for s3 uploads [release/1.17] (#1824) (…
blink1073 Sep 30, 2024
bd39092
GODRIVER-2589 [release/1.17] Clarify `*Cursor.All()` behavior in comm…
blink1073 Sep 30, 2024
c0afeee
GODRIVER-3358 [release/1.17] Do not override authSource from TXT reco…
blink1073 Sep 30, 2024
b473d1b
GODRIVER-3313 [release/1.17] Skip CSOT spec tests on Windows and macO…
blink1073 Sep 30, 2024
b45e5d9
GODRIVER-3156 Detect and discard closed idle connections. (#1815) [re…
mongodb-drivers-pr-bot[bot] Oct 1, 2024
070817d
BUMP v1.17.1
mongodb-dbx-release-bot[bot] Oct 1, 2024
027313b
Bump golangci-lint for 1.23 compatibility [v1] (#1875)
matthewdale Oct 24, 2024
32067cf
Fix data race in 'discard connections' pool test. [v1] (#1877)
matthewdale Oct 24, 2024
714be54
GODRIVER-3374 Add ReadCompressedCompressedMessage back to wiremessage…
prestonvasquez Oct 21, 2024
566810c
GODRIVER-3340 Bump github.com/klauspost/compress from 1.13.6 to 1.16.…
matthewdale Oct 25, 2024
4aeff60
GODRIVER-3370 Add bypassEmptyTsReplacement option. (#1927) [release/1…
mongodb-drivers-pr-bot[bot] Feb 20, 2025
d19dc26
GODRIVER-3470 Correct BSON unmarshaling logic for null values (#1924)…
matthewdale Feb 21, 2025
735c0d3
Cherry pick 1.17.2 work to release/1.17 (#1956)
prestonvasquez Feb 22, 2025
390be81
Update reviewers.txt (#1855) [v1] (#1883) [release/1.17] (#1958)
mongodb-drivers-pr-bot[bot] Feb 24, 2025
7f9f8b6
GODRIVER-3448 Limit GOMAXPROCS for fuzz tests (#1939) [v1] (#1943) [r…
mongodb-drivers-pr-bot[bot] Feb 24, 2025
9c48575
BUMP v1.17.3
mongodb-dbx-release-bot[bot] Feb 25, 2025
c2ca35c
Add GitHub Actions workflow for merge ups (#1962)
alcaeus Mar 3, 2025
785d943
Use different credentials for merge-up PRs (#1968)
alcaeus Mar 4, 2025
969166c
Mark release/1.17 as fully merged into v1
alcaeus Mar 4, 2025
bf51cde
Merge branch 'release/1.17' into merge-release/1.17-into-v1-174109116…
alcaeus Mar 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Merge up

on:
push:
branches:
- release/*.*
- v*

permissions:
id-token: write
contents: write
pull-requests: write

jobs:
merge-up:
name: Create merge up pull request
runs-on: ubuntu-latest

steps:
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
with:
app_id: ${{ vars.PR_APP_ID }}
private_key: ${{ secrets.PR_APP_PRIVATE_KEY }}
# Make sure to include fetch-depth 0 so all branches are fetched, not
# just the current one
fetch-depth: 0

- name: Create pull request
id: create-pull-request
uses: alcaeus/automatic-merge-up-action@main
with:
ref: ${{ github.ref_name }}
branchNamePattern: 'release/<major>.<minor>'
devBranchNamePattern: 'v<major>'
fallbackBranch: 'master'
enableAutoMerge: true
Loading