Skip to content

Commit d3ae043

Browse files
committed
Merge branch 'main' into ni/new-distros
* main: chore: Migrate rhel72-zseries to rhel7-zseries MONGOSH-1835 (#2238) chore: update auto-generated files (#2244) chore(deps): bump driver, bson to latest MONGOSH-1890 MONGOSH-1889 (#2243) chore: update auto-generated files (#2242) chore: update auto-generated files (#2241) chore(ci): Add a workflow to validate PR titles (#2240)
2 parents 5d75866 + a9df9e0 commit d3ae043

File tree

25 files changed

+4855
-31546
lines changed

25 files changed

+4855
-31546
lines changed

.evergreen.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17190,8 +17190,8 @@ buildvariants:
1719017190
tasks:
1719117191
- name: compile_artifact
1719217192
- name: linux_s390x_build
17193-
display_name: "RHEL 7.2 s390x (build)"
17194-
run_on: rhel72-zseries-large
17193+
display_name: "RHEL 7 s390x (build)"
17194+
run_on: rhel7-zseries-large
1719517195
expansions:
1719617196
executable_os_id: linux-s390x
1719717197
tasks:
@@ -17375,14 +17375,14 @@ buildvariants:
1737517375
run_on: rhel8-power-small
1737617376
tasks:
1737717377
- name: e2e_tests_linux_ppc64le
17378-
- name: e2e_rhel72_s390x
17379-
display_name: "RHEL 7.2 s390x (E2E Tests)"
17380-
run_on: rhel72-zseries-large
17378+
- name: e2e_rhel7_s390x
17379+
display_name: "RHEL 7 s390x (E2E Tests)"
17380+
run_on: rhel7-zseries-large
1738117381
tasks:
1738217382
- name: e2e_tests_linux_s390x_60x
17383-
- name: e2e_rhel83_s390x
17384-
display_name: "RHEL 8.3 s390x (E2E Tests)"
17385-
run_on: rhel83-zseries-small
17383+
- name: e2e_rhel8_s390x
17384+
display_name: "RHEL 8 s390x (E2E Tests)"
17385+
run_on: rhel8-zseries-small
1738617386
tasks:
1738717387
- name: e2e_tests_linux_s390x
1738817388
- name: e2e_macos14_x64
@@ -17738,16 +17738,16 @@ buildvariants:
1773817738
run_on: macos-14-arm64
1773917739
tasks:
1774017740
- name: pkg_test_macos_darwin_arm64
17741-
- name: pkg_smoke_tests_rhel72_s390x
17742-
display_name: "package smoke tests (RHEL 7.2 s390x)"
17743-
run_on: rhel72-zseries-small
17741+
- name: pkg_smoke_tests_rhel7_s390x
17742+
display_name: "package smoke tests (RHEL 7 s390x)"
17743+
run_on: rhel7-zseries-small
1774417744
expansions:
1774517745
no_automatic_encryption_support: 1
1774617746
tasks:
1774717747
- name: pkg_test_rpmextract_rpm_s390x
17748-
- name: pkg_smoke_tests_rhel83_s390x
17749-
display_name: "package smoke tests (RHEL 8.3 s390x)"
17750-
run_on: rhel83-zseries-small
17748+
- name: pkg_smoke_tests_rhel8_s390x
17749+
display_name: "package smoke tests (RHEL 8 s390x)"
17750+
run_on: rhel8-zseries-small
1775117751
tasks:
1775217752
- name: pkg_test_rpmextract_rpm_s390x
1775317753
- name: pkg_smoke_tests_rhel81_ppc64le

.evergreen/compilation-context-expansions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel72-zseries|rhel81-power8|amazon2-arm64|macos)"
1+
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
22
export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"
33

44
if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then

.evergreen/compilation-context-expansions.test.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@ macos-11-arm64=true
2525
macos-13-arm64=true
2626
rhel70-build=true
2727
rhel70-large=true
28-
rhel72-zseries-large=true
29-
rhel72-zseries-small=true
28+
rhel72-zseries-large=false
29+
rhel72-zseries-small=false
30+
rhel7-zseries-large=true
31+
rhel7-zseries-small=true
3032
rhel76-large=false
3133
rhel80-small=false
3234
rhel81-power8-small=true
3335
rhel82-arm64-small=false
3436
rhel83-fips=false
3537
rhel83-zseries-small=false
38+
rhel8-zseries-small=false
3639
rhel90-arm64-small=false
3740
rhel90-small=false
3841
rhel93-fips=false

.evergreen/evergreen.yml.in

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,8 +1683,8 @@ buildvariants:
16831683
tasks:
16841684
- name: compile_artifact
16851685
- name: linux_s390x_build
1686-
display_name: "RHEL 7.2 s390x (build)"
1687-
run_on: rhel72-zseries-large
1686+
display_name: "RHEL 7 s390x (build)"
1687+
run_on: rhel7-zseries-large
16881688
expansions:
16891689
executable_os_id: linux-s390x
16901690
tasks:
@@ -1868,14 +1868,14 @@ buildvariants:
18681868
run_on: rhel8-power-small
18691869
tasks:
18701870
- name: e2e_tests_linux_ppc64le
1871-
- name: e2e_rhel72_s390x
1872-
display_name: "RHEL 7.2 s390x (E2E Tests)"
1873-
run_on: rhel72-zseries-large
1871+
- name: e2e_rhel7_s390x
1872+
display_name: "RHEL 7 s390x (E2E Tests)"
1873+
run_on: rhel7-zseries-large
18741874
tasks:
18751875
- name: e2e_tests_linux_s390x_60x
1876-
- name: e2e_rhel83_s390x
1877-
display_name: "RHEL 8.3 s390x (E2E Tests)"
1878-
run_on: rhel83-zseries-small
1876+
- name: e2e_rhel8_s390x
1877+
display_name: "RHEL 8 s390x (E2E Tests)"
1878+
run_on: rhel8-zseries-small
18791879
tasks:
18801880
- name: e2e_tests_linux_s390x
18811881
- name: e2e_macos14_x64
@@ -2003,16 +2003,16 @@ buildvariants:
20032003
run_on: macos-14-arm64
20042004
tasks:
20052005
- name: pkg_test_macos_darwin_arm64
2006-
- name: pkg_smoke_tests_rhel72_s390x
2007-
display_name: "package smoke tests (RHEL 7.2 s390x)"
2008-
run_on: rhel72-zseries-small
2006+
- name: pkg_smoke_tests_rhel7_s390x
2007+
display_name: "package smoke tests (RHEL 7 s390x)"
2008+
run_on: rhel7-zseries-small
20092009
expansions:
20102010
no_automatic_encryption_support: 1
20112011
tasks:
20122012
- name: pkg_test_rpmextract_rpm_s390x
2013-
- name: pkg_smoke_tests_rhel83_s390x
2014-
display_name: "package smoke tests (RHEL 8.3 s390x)"
2015-
run_on: rhel83-zseries-small
2013+
- name: pkg_smoke_tests_rhel8_s390x
2014+
display_name: "package smoke tests (RHEL 8 s390x)"
2015+
run_on: rhel8-zseries-small
20162016
tasks:
20172017
- name: pkg_test_rpmextract_rpm_s390x
20182018
- name: pkg_smoke_tests_rhel81_ppc64le
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "Check PR Title"
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited]
5+
6+
jobs:
7+
check-pr-title:
8+
name: Check PR Title
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Enforce conventional commit style
12+
uses: realm/ci-actions/title-checker@main
13+
with:
14+
regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|ops){1}(\([\w\-\.]+\))?(!)?: .*'
15+
error-hint: 'Invalid PR title. Make sure it follows the conventional commit specification (i.e. "<type>(<optional scope>): <description>") or add the no-title-validation label'
16+
ignore-labels: 'no-title-validation'
17+
- name: Enforce JIRA ticket in title
18+
uses: realm/ci-actions/title-checker@main
19+
# Skip the JIRA ticket check for PRs opened by bots
20+
if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }}
21+
with:
22+
regex: '[A-Z]{4,10}-[0-9]{1,5}$'
23+
error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. MONGOSH-1234 or add the no-title-validation label'
24+
ignore-labels: 'no-title-validation'

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ Alena Khineika <[email protected]>
4141
Orgad Shaneh <[email protected]>
4242
Kræn Hansen <[email protected]>
4343
Gagik Amaryan <[email protected]>
44+
Nikola Irinchev <[email protected]>

THIRD_PARTY_NOTICES.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **mongosh**.
2-
This document was automatically generated on Fri Oct 25 2024.
2+
This document was automatically generated on Mon Oct 28 2024.
33

44
## List of dependencies
55

@@ -179,7 +179,7 @@ Package|Version|License
179179
**[bplist-parser](#a012056f1b32796d923573a3b1ef72cf36943d95e5e2f6af0f7eeab57a21be24)**|0.2.0|MIT
180180
**[brace-expansion](#2ba3ee23cc6a2718243e9c0c59ce154058f292965f563aa291b459a414e863cb)**|1.1.11|MIT
181181
**[browserslist](#a95274c46e5fc3c90b90fdf6cc259a6b44331ddca76e255afd128465621592ed)**|4.23.3|MIT
182-
**[bson](#d6c506bcc160fe77704fb17890d28ffb1d1c30b72dbce07bd5e970af63932d46)**|6.8.0|Apache-2.0
182+
**[bson](#b5de8374b38fe7ca4367cde774b5448c4317dd3c937fef241731cd6b39dceeaa)**|6.9.0|Apache-2.0
183183
**[buffer-alloc-unsafe](#1022220a813dd092d3ced592ac36121a00bd08a9c2020e08ad370dc29ed217f0)**|1.1.0|MIT
184184
**[buffer-alloc](#d5cbc95b9dde4a46cd45334630efe3bc9025c904074bee845376bd60651441c0)**|1.2.0|MIT
185185
**[buffer-fill](#c3747dfd267829ceeb564a1717d0c65d88d2b366e215f640067abefac59e3fd4)**|1.0.0|MIT
@@ -348,7 +348,7 @@ Package|Version|License
348348
**[mongodb-crypt-library-version](#003bd2892d6f6fdac0613ba8f9a2fbb054ddd1c26901e1d2fc7e83861b21cf4d)**|1.0.5|Apache-2.0
349349
**[mongodb-log-writer](#c4945018f8490fc8e56e1414e262fcf1b802800e05cd15f2bd6b7a9d0b94af85)**|1.4.2|Apache-2.0
350350
**[mongodb-redact](#d246d19a773f4cc2f2d0431d018a38295c9f9b1b45cfbe7ee16230056b667453)**|1.1.2|Apache-2.0
351-
**[mongodb](#8359f923d8c3b1a357d06d091825d7c04bb269086e94b6f8617edd5b4b03fa2b)**|6.9.0|Apache-2.0
351+
**[mongodb](#435929756f32840b6ee67bc26155513cd7001bd8bab6e30ddaec63024b6fdcd1)**|6.10.0|Apache-2.0
352352
**[ms](#484b814b85d5028e34246147c8fc901d33570202bd7cdc3703c0ed1078eba0aa)**|2.0.0|MIT
353353
**[ms](#0a987b2f79ff37005e452a5afa7dacd3042061a7077054d2ba9cabacd88506d2)**|2.1.2|MIT
354354
**[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)**|2.1.3|MIT
@@ -20637,8 +20637,8 @@ License files:
2063720637

2063820638

2063920639

20640-
<a id="d6c506bcc160fe77704fb17890d28ffb1d1c30b72dbce07bd5e970af63932d46"></a>
20641-
### [bson](https://www.npmjs.com/package/bson) (version 6.8.0)
20640+
<a id="b5de8374b38fe7ca4367cde774b5448c4317dd3c937fef241731cd6b39dceeaa"></a>
20641+
### [bson](https://www.npmjs.com/package/bson) (version 6.9.0)
2064220642
License tags: Apache-2.0
2064320643

2064420644
License files:
@@ -27892,8 +27892,8 @@ License files:
2789227892

2789327893

2789427894

27895-
<a id="8359f923d8c3b1a357d06d091825d7c04bb269086e94b6f8617edd5b4b03fa2b"></a>
27896-
### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.9.0)
27895+
<a id="435929756f32840b6ee67bc26155513cd7001bd8bab6e30ddaec63024b6fdcd1"></a>
27896+
### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.10.0)
2789727897
License tags: Apache-2.0
2789827898

2789927899
License files:

0 commit comments

Comments
 (0)