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

Author: github-actions[bot]

.evergreen/functions.yml

@@ -40,7 +40,7 @@ variables:
     # WARN: This version is behind our electron runtime, but updating it will
     # drop support for some older linux platforms, so we are keeping them out of
     # sync for now
-    # TODO: https://jira.mongodb.org/browse/COMPASS-6915 
+    # TODO: https://jira.mongodb.org/browse/COMPASS-6915
     NODE_JS_VERSION: '16.20.2'
     NPM_VERSION: '8.19.4'
     # secrets
@@ -323,38 +323,42 @@ functions:
         shell: bash
         env:
           <<: *compass-env
-          COMPASS_APP_PATH: ${appPath}
-          COMPASS_APP_NAME: ${packagerOptions.name}
+          COMPASS_APP_PATH_ORIGINAL: ${appPath}
         script: |
           set -e
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
+          set -x
 
           # Check the app bundle size.
           npm run --workspace mongodb-compass check-bundled-app-size
 
-          echo "Unpacking ${app_archive_name} ..."
+          if [[ "$IS_WINDOWS" == "true" ]]; then
+            COMPASS_OUTDIR="$COMPASS_APP_PATH_ORIGINAL"
+          else
+            # Unpack outside the Compass working tree to avoid interactions with
+            # npm packages from inside it.
+            # (This doesn't seem to work on Windows without issues around being
+            # able to spawn the extracted executable, unfortunately.)
+            COMPASS_OUTDIR="$PWD/../tmp/from-packaged"
+          fi
+
+          mkdir -p "$COMPASS_OUTDIR"
+          echo "Unpacking ${app_archive_name} to $COMPASS_OUTDIR ..."
 
           # Unpack the app archive
           if [[ "${app_archive_name}" == *.zip ]]; then
-            COMPASS_OUTDIR="$COMPASS_APP_PATH"
-            if [[ "$IS_OSX" == "true" ]]; then
-              # unzip on macos needs a different path to avoid nesting the .app
-              # inside another .app dir
-              COMPASS_OUTDIR=$(dirname "$COMPASS_APP_PATH")
-            fi
-            echo "Unpacking ${app_archive_name} to $COMPASS_OUTDIR ..."
-            mkdir -p "$COMPASS_OUTDIR"
             unzip "packages/compass/dist/${app_archive_name}" -d "$COMPASS_OUTDIR"
           else
-            COMPASS_OUTDIR="packages/compass/dist"
-            echo "Unpacking ${app_archive_name} to $COMPASS_OUTDIR ..."
-            mkdir -p "$COMPASS_OUTDIR"
             tar -xzf "packages/compass/dist/${app_archive_name}" -C "$COMPASS_OUTDIR"
           fi
 
           # Print folder content to confirm that it worked
-          ls -la packages/compass/dist
+          ls -la "$COMPASS_OUTDIR"
+
+          if [[ "$IS_WINDOWS" == "true" ]]; then
+            chmod +x "$COMPASS_OUTDIR"/*.exe
+          fi
 
   e2e-coverage:
     - command: shell.exec
@@ -387,7 +391,7 @@ functions:
         shell: bash
         env:
           <<: *compass-env
-          COMPASS_APP_PATH: ${appPath}
+          COMPASS_APP_PATH_ORIGINAL: ${appPath}
           COMPASS_APP_NAME: ${packagerOptions.name}
           DEBUG: ${debug|}
           MONGODB_VERSION: ${mongodb_version|}
@@ -398,10 +402,15 @@ functions:
           eval $(.evergreen/print-compass-env.sh)
           source .evergreen/start-docker-envs.sh
 
+          if [[ "$IS_WINDOWS" == "true" ]]; then
+            export COMPASS_APP_PATH="$COMPASS_APP_PATH_ORIGINAL"
+          else
+            export COMPASS_APP_PATH="$PWD/../tmp/from-packaged/$(basename "$COMPASS_APP_PATH_ORIGINAL")"
+          fi
           echo "Running tests against packaged app at $COMPASS_APP_PATH for MongoDB $MONGODB_VERSION..."
 
           if [[ "$IS_OSX" == "true" ]]; then
-            echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/BUILD-14458)"
+            echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/COMPASS-7102)"
             export COMPASS_E2E_DISABLE_KEYCHAIN_USAGE="true"
             echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
             export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Mon Sep 25 2023.
+This document was automatically generated on Tue Sep 26 2023.
 
 ## List of dependencies
 
@@ -234,7 +234,6 @@ This document was automatically generated on Mon Sep 25 2023.
 | **[debug](#233219ced46fb5b84e28859835e97775eb9d0181f4cb85d6aa5cecb61e595947)**                                              | 2.6.9        | MIT                                 |
 | **[debug](#d17e389ce22af9246d1b07714885a99a0c7ffce55db7f2ecf52bfef063e8c8ac)**                                              | 4.3.1        | MIT                                 |
 | **[decompress-response](#71cad5eab34cc643a6a7853a43d3090ac7e8b6014c9ec55fabb8112cdbfd9fbd)**                                | 5.0.0        | MIT                                 |
-| **[dedent](#339f63cd441e23f69d2d748fb33f2abd1800e36538a684f9005b16194d1c219b)**                                             | 1.5.1        | MIT                                 |
 | **[deep-extend](#654bd7d00073c2195bca924a07d93393b2aaf5cacbb6f52a383877f6f33dbfbf)**                                        | 0.6.0        | MIT                                 |
 | **[default-browser-id](#bc6a381b83371172dbb72cac459792e2d4d55ecb71165c082142ef085b2130ee)**                                 | 3.0.0        | MIT                                 |
 | **[default-browser](#bf5c7331e49e4c648e57747ffd553870a7fe79fea24780366a6bc22ef346f304)**                                    | 4.0.0        | MIT                                 |
@@ -20040,38 +20039,6 @@ License files:
 
       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-<a id="339f63cd441e23f69d2d748fb33f2abd1800e36538a684f9005b16194d1c219b"></a>
-
-### [dedent](https://www.npmjs.com/package/dedent) (version 1.5.1)
-
-License tags: MIT
-
-License files:
-
-- LICENSE:
-
-      The MIT License (MIT)
-
-      Copyright (c) 2015 Desmond Brand ([email protected])
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy
-      of this software and associated documentation files (the "Software"), to deal
-      in the Software without restriction, including without limitation the rights
-      to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-      copies of the Software, and to permit persons to whom the Software is
-      furnished to do so, subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in
-      all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-      AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-      THE SOFTWARE.
-
 <a id="654bd7d00073c2195bca924a07d93393b2aaf5cacbb6f52a383877f6f33dbfbf"></a>
 
 ### [deep-extend](https://www.npmjs.com/package/deep-extend) (version 0.6.0)