Skip to content

Commit

Permalink
Merge branch 'main' into ni/new-distros
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
nirinchev committed Oct 30, 2024
2 parents 5d75866 + a9df9e0 commit d3ae043
Show file tree
Hide file tree
Showing 25 changed files with 4,855 additions and 31,546 deletions.
28 changes: 14 additions & 14 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17190,8 +17190,8 @@ buildvariants:
tasks:
- name: compile_artifact
- name: linux_s390x_build
display_name: "RHEL 7.2 s390x (build)"
run_on: rhel72-zseries-large
display_name: "RHEL 7 s390x (build)"
run_on: rhel7-zseries-large
expansions:
executable_os_id: linux-s390x
tasks:
Expand Down Expand Up @@ -17375,14 +17375,14 @@ buildvariants:
run_on: rhel8-power-small
tasks:
- name: e2e_tests_linux_ppc64le
- name: e2e_rhel72_s390x
display_name: "RHEL 7.2 s390x (E2E Tests)"
run_on: rhel72-zseries-large
- name: e2e_rhel7_s390x
display_name: "RHEL 7 s390x (E2E Tests)"
run_on: rhel7-zseries-large
tasks:
- name: e2e_tests_linux_s390x_60x
- name: e2e_rhel83_s390x
display_name: "RHEL 8.3 s390x (E2E Tests)"
run_on: rhel83-zseries-small
- name: e2e_rhel8_s390x
display_name: "RHEL 8 s390x (E2E Tests)"
run_on: rhel8-zseries-small
tasks:
- name: e2e_tests_linux_s390x
- name: e2e_macos14_x64
Expand Down Expand Up @@ -17738,16 +17738,16 @@ buildvariants:
run_on: macos-14-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_rhel72_s390x
display_name: "package smoke tests (RHEL 7.2 s390x)"
run_on: rhel72-zseries-small
- name: pkg_smoke_tests_rhel7_s390x
display_name: "package smoke tests (RHEL 7 s390x)"
run_on: rhel7-zseries-small
expansions:
no_automatic_encryption_support: 1
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel83_s390x
display_name: "package smoke tests (RHEL 8.3 s390x)"
run_on: rhel83-zseries-small
- name: pkg_smoke_tests_rhel8_s390x
display_name: "package smoke tests (RHEL 8 s390x)"
run_on: rhel8-zseries-small
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel81_ppc64le
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/compilation-context-expansions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel72-zseries|rhel81-power8|amazon2-arm64|macos)"
export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"

if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then
Expand Down
7 changes: 5 additions & 2 deletions .evergreen/compilation-context-expansions.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,17 @@ macos-11-arm64=true
macos-13-arm64=true
rhel70-build=true
rhel70-large=true
rhel72-zseries-large=true
rhel72-zseries-small=true
rhel72-zseries-large=false
rhel72-zseries-small=false
rhel7-zseries-large=true
rhel7-zseries-small=true
rhel76-large=false
rhel80-small=false
rhel81-power8-small=true
rhel82-arm64-small=false
rhel83-fips=false
rhel83-zseries-small=false
rhel8-zseries-small=false
rhel90-arm64-small=false
rhel90-small=false
rhel93-fips=false
Expand Down
28 changes: 14 additions & 14 deletions .evergreen/evergreen.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -1683,8 +1683,8 @@ buildvariants:
tasks:
- name: compile_artifact
- name: linux_s390x_build
display_name: "RHEL 7.2 s390x (build)"
run_on: rhel72-zseries-large
display_name: "RHEL 7 s390x (build)"
run_on: rhel7-zseries-large
expansions:
executable_os_id: linux-s390x
tasks:
Expand Down Expand Up @@ -1868,14 +1868,14 @@ buildvariants:
run_on: rhel8-power-small
tasks:
- name: e2e_tests_linux_ppc64le
- name: e2e_rhel72_s390x
display_name: "RHEL 7.2 s390x (E2E Tests)"
run_on: rhel72-zseries-large
- name: e2e_rhel7_s390x
display_name: "RHEL 7 s390x (E2E Tests)"
run_on: rhel7-zseries-large
tasks:
- name: e2e_tests_linux_s390x_60x
- name: e2e_rhel83_s390x
display_name: "RHEL 8.3 s390x (E2E Tests)"
run_on: rhel83-zseries-small
- name: e2e_rhel8_s390x
display_name: "RHEL 8 s390x (E2E Tests)"
run_on: rhel8-zseries-small
tasks:
- name: e2e_tests_linux_s390x
- name: e2e_macos14_x64
Expand Down Expand Up @@ -2003,16 +2003,16 @@ buildvariants:
run_on: macos-14-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_rhel72_s390x
display_name: "package smoke tests (RHEL 7.2 s390x)"
run_on: rhel72-zseries-small
- name: pkg_smoke_tests_rhel7_s390x
display_name: "package smoke tests (RHEL 7 s390x)"
run_on: rhel7-zseries-small
expansions:
no_automatic_encryption_support: 1
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel83_s390x
display_name: "package smoke tests (RHEL 8.3 s390x)"
run_on: rhel83-zseries-small
- name: pkg_smoke_tests_rhel8_s390x
display_name: "package smoke tests (RHEL 8 s390x)"
run_on: rhel8-zseries-small
tasks:
- name: pkg_test_rpmextract_rpm_s390x
- name: pkg_smoke_tests_rhel81_ppc64le
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Check PR Title"
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited]

jobs:
check-pr-title:
name: Check PR Title
runs-on: ubuntu-latest
steps:
- name: Enforce conventional commit style
uses: realm/ci-actions/title-checker@main
with:
regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|ops){1}(\([\w\-\.]+\))?(!)?: .*'
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'
ignore-labels: 'no-title-validation'
- name: Enforce JIRA ticket in title
uses: realm/ci-actions/title-checker@main
# Skip the JIRA ticket check for PRs opened by bots
if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }}
with:
regex: '[A-Z]{4,10}-[0-9]{1,5}$'
error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. MONGOSH-1234 or add the no-title-validation label'
ignore-labels: 'no-title-validation'
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ Alena Khineika <[email protected]>
Orgad Shaneh <[email protected]>
Kræn Hansen <[email protected]>
Gagik Amaryan <[email protected]>
Nikola Irinchev <[email protected]>
14 changes: 7 additions & 7 deletions THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The following third-party software is used by and included in **mongosh**.
This document was automatically generated on Fri Oct 25 2024.
This document was automatically generated on Mon Oct 28 2024.

## List of dependencies

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



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

License files:
Expand Down Expand Up @@ -27892,8 +27892,8 @@ License files:



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

License files:
Expand Down
Loading

0 comments on commit d3ae043

Please sign in to comment.