From 8708ca8b6964eb525418c86432ab3b366dbf177d Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 25 Sep 2025 17:33:11 +0200 Subject: [PATCH 1/4] Disable merge-up from release/1.17 (#2202) --- .github/workflows/merge-up.yml | 37 ---------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .github/workflows/merge-up.yml diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml deleted file mode 100644 index 30726ae2f2..0000000000 --- a/.github/workflows/merge-up.yml +++ /dev/null @@ -1,37 +0,0 @@ -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@1.0.0 - with: - ref: ${{ github.ref_name }} - branchNamePattern: 'release/.' - devBranchNamePattern: 'v' - fallbackBranch: 'master' - ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }} - enableAutoMerge: true From 21f47d4287f28410b3d1852128ed299ba7b2609e Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 26 Sep 2025 05:37:37 +0200 Subject: [PATCH 2/4] Allow ignore-for-release label to satisfy label checker (#2203) --- .github/workflows/check-labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml index 6a1be9c31c..467249202f 100644 --- a/.github/workflows/check-labels.yml +++ b/.github/workflows/check-labels.yml @@ -15,5 +15,5 @@ jobs: steps: - uses: docker://agilepathway/pull-request-label-checker:latest with: - one_of: bug,feature,enhancement,documentation,dependencies + one_of: bug,feature,enhancement,documentation,dependencies,ignore-for-release repo_token: ${{ secrets.GITHUB_TOKEN }} From b8790284926105a1ad35cf8c7be5fb642b78d8ac Mon Sep 17 00:00:00 2001 From: Matt Dale <9760375+matthewdale@users.noreply.github.com> Date: Wed, 22 Oct 2025 09:46:17 -0700 Subject: [PATCH 3/4] GODRIVER-3654 Don't test v1 branches against latest server. (#2188) --- .evergreen/config.yml | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 22b8bb2d93..aab8226478 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2039,7 +2039,7 @@ tasks: commands: - func: "bootstrap-mongo-orchestration" vars: - VERSION: "latest" + VERSION: "8.0" TOPOLOGY: "replica_set" - func: "run-search-index-tests" @@ -2083,10 +2083,6 @@ axes: display_name: "rapid" variables: VERSION: "rapid" - - id: "latest" - display_name: "latest" - variables: - VERSION: "latest" # OSes that require >= 3.2 for SSL - id: os-ssl-32 @@ -2544,12 +2540,6 @@ buildvariants: tasks: - name: ".test !.enterprise-auth !.snappy" - - matrix_name: "tests-latest-zlib-zstd-support" - matrix_spec: { version: ["latest"], os-ssl-40: ["windows-64", "rhel87-64"] } - display_name: "${version} ${os-ssl-40}" - tasks: - - name: ".test !.enterprise-auth !.snappy" - - matrix_name: "enterprise-auth-tests" matrix_spec: { os-ssl-32: "*" } display_name: "Enterprise Auth - ${os-ssl-32}" @@ -2557,20 +2547,20 @@ buildvariants: - name: ".test .enterprise-auth" - matrix_name: "aws-auth-test" - matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-aws-auth: "*" } + matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0"], os-aws-auth: "*" } display_name: "MONGODB-AWS Auth ${version} ${os-aws-auth}" tasks: - name: "aws-auth-test" - matrix_name: "ocsp-test" - matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], ocsp-rhel-87: ["rhel87"] } + matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0"], ocsp-rhel-87: ["rhel87"] } display_name: "OCSP ${version} ${ocsp-rhel-87}" batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README tasks: - name: ".ocsp" - matrix_name: "ocsp-test-windows" - matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["windows-64"] } + matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["windows-64"] } display_name: "OCSP ${version} ${os-ssl-40}" batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README tasks: @@ -2578,7 +2568,7 @@ buildvariants: - name: ".ocsp-rsa !.ocsp-staple" - matrix_name: "ocsp-test-macos" - matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos11"] } + matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["macos11"] } display_name: "OCSP ${version} ${os-ssl-40}" batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README tasks: @@ -2599,12 +2589,6 @@ buildvariants: tasks: - name: ".versioned-api" - - matrix_name: "versioned-api-latest-test" - matrix_spec: { version: ["latest"], os-ssl-40: ["windows-64", "rhel87-64"] } - display_name: "API Version ${version} ${os-ssl-40}" - tasks: - - name: ".versioned-api" - - matrix_name: "kms-tls-test" matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64"] } display_name: "KMS TLS ${os-ssl-40}" @@ -2618,12 +2602,6 @@ buildvariants: tasks: - name: ".load-balancer" - - matrix_name: "load-balancer-latest-test" - matrix_spec: { version: ["latest"], os-ssl-40: ["rhel87-64"] } - display_name: "Load Balancer Support ${version} ${os-ssl-40}" - tasks: - - name: ".load-balancer" - - matrix_name: "kms-kmip-test" matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64"] } display_name: "KMS KMIP ${os-ssl-40}" From f1d540b2c4e606b6b0aa5d482fad848139664ef4 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 22 Oct 2025 23:18:45 +0000 Subject: [PATCH 4/4] BUMP v1.17.5 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index cf9127b008..1a3c81541c 100644 --- a/version/version.go +++ b/version/version.go @@ -11,4 +11,4 @@ package version // Driver is the current version of the driver. -var Driver = "1.17.4" +var Driver = "1.17.5"