Merge remote-tracking branch 'origin/beta-releases' into ga-releases

Author: github-actions[bot]

.evergreen/functions.yml

@@ -83,6 +83,12 @@ variables:
 
 # This is here with the variables because anchors aren't supported across includes
 post:
+  - command: shell.exec
+    params:
+      working_dir: src
+      shell: bash
+      script: |
+        tar czvf all-e2e-logs.tgz packages/compass-e2e-tests/.log
   - command: s3.put
     params:
       <<: *save-artifact-params-private
@@ -92,6 +98,7 @@ post:
         - src/packages/compass-e2e-tests/.nyc_output/coverage.json
         - src/.testserver/logs/*
         - src/.evergreen/logs/*
+        - src/all-e2e-logs.tgz
       remote_file: ${project}/${revision}_${revision_order_id}/${build_variant}/${task_name}
       content_type: text/plain
   - command: s3.put
@@ -324,16 +331,16 @@ functions:
         wait: true
     # copy ssh key (this key will be used to connect to ssh server)
     - command: shell.exec
+      silent: true
       params:
+        working_dir: src
         shell: bash
+        env:
+          __project_aws_ssh_key_value: ${__project_aws_ssh_key_value}
         script: |
           set -e
-          {
-          set +x
-          echo '${__project_aws_ssh_key_value}' > ~/.ssh/mcipacker.pem
-          chmod 0600 ~/.ssh/mcipacker.pem
-          set -x
-          }
+          .evergreen/setup-ssh-key.sh
+
     # wait for host to be ready
     - command: shell.exec
       params:
@@ -367,7 +374,7 @@ functions:
             sleep 20
           done
           echo "SSH connection established after $attempts attempts"
-    
+
           # Write the host info so that it can be used by the signing tool
           if [[ $OSTYPE == "cygwin" ]]; then
             identity_file=$(cygpath -wa "$identity_file")
@@ -566,7 +573,7 @@ functions:
             tar -xvz)
           export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
           npm run test-csfle --workspace mongodb-data-service
-  
+
   verify-artifacts:
     - command: shell.exec
       params:

.evergreen/setup-ssh-key.sh

@@ -0,0 +1,6 @@
+#! /usr/bin/env bash
+
+set -e
+set +x
+echo "${__project_aws_ssh_key_value}" > ~/.ssh/mcipacker.pem
+chmod 0600 ~/.ssh/mcipacker.pem

.evergreen/tasks.in.yml

@@ -108,7 +108,7 @@ tasks:
       - func: spawn-signing-server
       - func: package
         vars:
-          debug: 'hadron*,mongo*,compass*,electron*'
+          debug: 'hadron*,mongo*,compass*,electron*,sign*'
           compass_distribution: <% out(packageTask.vars.compass_distribution) %>
       - func: verify-artifacts
       - func: save-all-artifacts

.evergreen/tasks.yml

@@ -108,7 +108,7 @@ tasks:
       - func: spawn-signing-server
       - func: package
         vars:
-          debug: 'hadron*,mongo*,compass*,electron*'
+          debug: 'hadron*,mongo*,compass*,electron*,sign*'
           compass_distribution: compass
       - func: verify-artifacts
       - func: save-all-artifacts
@@ -129,7 +129,7 @@ tasks:
       - func: spawn-signing-server
       - func: package
         vars:
-          debug: 'hadron*,mongo*,compass*,electron*'
+          debug: 'hadron*,mongo*,compass*,electron*,sign*'
           compass_distribution: compass-readonly
       - func: verify-artifacts
       - func: save-all-artifacts
@@ -150,7 +150,7 @@ tasks:
       - func: spawn-signing-server
       - func: package
         vars:
-          debug: 'hadron*,mongo*,compass*,electron*'
+          debug: 'hadron*,mongo*,compass*,electron*,sign*'
           compass_distribution: compass-isolated
       - func: verify-artifacts
       - func: save-all-artifacts

.github/dependabot.yml

@@ -3,58 +3,76 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
+    versioning-strategy: increase
     directory: "/"
     schedule:
       interval: "daily"
     allow:
-      # Standalone deps
-      - dependency-name: "mongodb"
-      - dependency-name: "bson"
-      # All the mongosh deps
-      - dependency-name: "@mongosh/node-runtime-worker-thread"
-      - dependency-name: "@mongosh/browser-repl"
-      - dependency-name: "@mongosh/logging"
-      - dependency-name: "@mongodb-js/oidc-plugin" # we bump mongosh when this updates
-      - dependency-name: "@mongodb-js/devtools-connect" # we bump mongosh when this updates
+      - dependency-name: mongodb
+      - dependency-name: mongodb-*
+      - dependency-name: bson
+      - dependency-name: bson-*
+      - dependency-name: "@mongosh/*"
+      - dependency-name: "@mongodb-js/*"
+      - dependency-name: os-dns-native
+      - dependency-name: system-ca
+
       # All the electron and its related deps
       - dependency-name: "electron"
-      - dependency-name: "@electron/remote"
-      - dependency-name: "@electron/rebuild"
+      - dependency-name: "@electron/*"
       - dependency-name: "browserslist"
       - dependency-name: "node-abi"
-      # All the devtools-shared packages https://github.com/mongodb-js/devtools-shared
-      - dependency-name: "@mongodb-js/dl-center"
-      - dependency-name: "@mongodb-js/get-os-info"
-      - dependency-name: "@mongodb-js/mongodb-constants"
-      - dependency-name: "@mongodb-js/mongodb-downloader"
-      - dependency-name: "mongodb-runner"
-      - dependency-name: "@mongodb-js/monorepo-tools"
-      - dependency-name: "@mongodb-js/oidc-mock-provider"
-      - dependency-name: "@mongodb-js/sbom-tools"
+      - dependency-name: "kerberos"
+      - dependency-name: "saslprep"
+      - dependency-name: "@leafygreen-ui/*"
     groups:
+      driver:
+        patterns:
+          - "mongodb"
+          - "bson"
+          - "@mongodb-js/oidc-plugin"
+          - "@mongodb-js/oidc-mock-provider"
+          - "@mongodb-js/devtools-connect"
+          - "mongodb-client-encryption"
+          - "kerberos"
+          - "os-dns-native"
+          - "system-ca"
+          - "saslprep"
+
       electron:
         patterns:
-        - "electron"
-        - "@electron/remote"
-        - "@electron/rebuild"
-        - "browserslist"
-        - "node-abi"
+          - "electron"
+          - "@electron/remote"
+          - "@electron/rebuild"
+          - "browserslist"
+          - "node-abi"
         update-types: ["minor", "patch"]
-      devtools-shared:
+
+      devtools-shared-prod:
+        patterns:
+          - "@mongodb-js/get-os-info"
+          - "@mongodb-js/mongodb-constants"
+          - "mongodb-cloud-info"
+          - "mongodb-query-parser"
+
+      devtools-shared-dev:
         patterns:
-        - "@mongodb-js/dl-center"
-        - "@mongodb-js/get-os-info"
-        - "@mongodb-js/mongodb-constants"
-        - "@mongodb-js/mongodb-downloader"
-        - "mongodb-runner"
-        - "@mongodb-js/monorepo-tools"
-        - "@mongodb-js/oidc-mock-provider"
-        - "@mongodb-js/sbom-tools"
+          - "@mongodb-js/dl-center"
+          - "@mongodb-js/mongodb-downloader"
+          - "@mongodb-js/monorepo-tools"
+          - "@mongodb-js/sbom-tools"
+          - "@mongodb-js/signing-utils"
+          - "mongodb-runner"
+
       mongosh:
         patterns:
-        - "@mongosh/*"
+          - "@mongosh/*"
+
+      leafygreen:
+        patterns:
+          - "@leafygreen-ui/*"
     commit-message:
       prefix: "chore"
       include: "scope"
     labels:
-      - "dependencies"
+      - "dependencies"

.github/workflows/update-electron.yaml

@@ -80,3 +80,4 @@ Hinson Chan <[email protected]>
 Gokul Raam <[email protected]>
 Bailey Pearson <[email protected]>
 Hao <[email protected]>
+Paula Stachova <[email protected]>