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

Author: github-actions[bot]

.evergreen/buildvariants.in.yml

@@ -17,6 +17,7 @@ buildvariants:
     tasks:
       - name: publish
       - name: publish-packages-next
+      - name: publish-dev-release
 
   - name: ubuntu_connectivity_tests
     display_name: Connectivity Tests

.evergreen/buildvariants.yml

@@ -17,6 +17,7 @@ buildvariants:
     tasks:
       - name: publish
       - name: publish-packages-next
+      - name: publish-dev-release
 
   - name: ubuntu_connectivity_tests
     display_name: Connectivity Tests

.evergreen/functions.yml

@@ -38,6 +38,7 @@ variables:
     EVERGREEN_TASK_URL: https://evergreen.mongodb.com/task/${task_id}
     EVERGREEN_VERSION_ID: ${version_id}
     EVERGREEN_WORKDIR: ${workdir}
+    EVERGREEN_CREATED_AT: ${created_at}
     # 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
@@ -301,9 +302,6 @@ functions:
           set -e
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
-
-          echo "Synchronizing evergreen environment from Compass build tools..."
-
           # Generates and expansion file with build target metadata in packages/compass/expansions.yml
           npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten ${compass_distribution} --out expansions.yml
     - command: expansions.update
@@ -411,7 +409,7 @@ functions:
           SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
         script: |
           set -e
-
+          # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
           .evergreen/compass_package.sh
     - command: shell.exec
@@ -442,12 +440,28 @@ functions:
           set -e
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
-          if [[ "${project}" == "10gen-compass-main" ]]; then
-            export npm_config_dry_run=true
-          fi
           echo "Uploading release assets to S3 and GitHub if needed..."
           npm run --workspace mongodb-compass upload
 
+  publish-dev-release:
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          <<: *compass-env
+        script: |
+          eval $(.evergreen/print-compass-env.sh)
+          .evergreen/publish-dev-release.sh LATEST
+    - command: s3.put
+      params:
+        <<: *save-artifact-params-public
+        local_file: src/LATEST
+        remote_file: ${project}/compass/dev/LATEST
+        content_type: text/plain
+        display_name: LATEST
+        optional: true
+
   get-packaged-app:
     - command: s3.get
       params:

.evergreen/print-compass-env.js

@@ -104,6 +104,7 @@ function printCompassEnv() {
   printVar('IS_UBUNTU', process.env.IS_UBUNTU);
   printVar('DEBUG', process.env.DEBUG);
   printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
+  printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
 }
 
 printCompassEnv();

.evergreen/print-compass-env.sh

@@ -30,4 +30,26 @@ fi
 export BASHPATH="$PATH"
 export OSTYPE="$OSTYPE"
 
+escapeLeadingZero() {
+    echo "$1" | sed 's/^0*//'
+}
+
+if [[ "${EVERGREEN_PROJECT}" == "10gen-compass-main" ]]; then
+    # We do not publish anything from the 10gen-compass-main project.
+    export npm_config_dry_run=true 
+    # When packaging Compass from main, we want to use the dev version identifier
+    # based on the created_at (when evergreen was triggered - formatted as 24_05_16_14_52_37).
+    if [[ "${EVERGREEN_BRANCH_NAME}" == "main" ]]; then
+        ts=($(echo "$EVERGREEN_CREATED_AT" | tr "_" " "))
+        year=$(escapeLeadingZero "${ts[0]}")
+        month=$(escapeLeadingZero "${ts[1]}")
+        day=$(escapeLeadingZero "${ts[2]}")
+        hour=$(escapeLeadingZero "${ts[3]}")
+        minute="${ts[4]}"
+        second="${ts[5]}"
+        export DEV_VERSION_IDENTIFIER="${year}.${month}.${day}-dev.${hour}${minute}${second}"
+    fi
+fi
+
+
 .evergreen/print-compass-env.js

.evergreen/publish-dev-release.sh

@@ -0,0 +1,21 @@
+#! /usr/bin/env bash
+
+set -e
+set -x
+
+if [[ "${EVERGREEN_PROJECT}" != "10gen-compass-main" ]]; then
+  echo "Trying to publish main compass (dev build) from ${EVERGREEN_PROJECT} project. Skipping...";
+  exit 0;
+fi
+
+if [[ "${EVERGREEN_BRANCH_NAME}" != "main" ]]; then
+  echo "Trying to publish main compass (dev build) from ${EVERGREEN_BRANCH_NAME} branch. Skipping...";
+  exit 0;
+fi
+
+URL="https://mciuploads.s3.amazonaws.com/${EVERGREEN_PROJECT}/compass/dev/$1"
+CURRENT_VERSION=$(curl -sf "${URL}" || echo "0.0.0-dev.0")
+
+echo "Comparing versions: $CURRENT_VERSION and $DEV_VERSION_IDENTIFIER"
+PUBLISH_VERSION=$(npx semver "$CURRENT_VERSION" "$DEV_VERSION_IDENTIFIER" | tail -n1 | xargs)
+echo "$PUBLISH_VERSION" > "$1"

.evergreen/tasks.in.yml

@@ -93,6 +93,14 @@ tasks:
       - func: install
       - func: bootstrap
       - func: publish-packages-next
+  - name: publish-dev-release
+    tags: []
+    depends_on:
+      - name: 'publish'
+        variant: '*'
+    commands:
+      - func: prepare
+      - func: publish-dev-release
 <% for (const packageTask of tasks.package) { %>
   - name: <% out(packageTask.name) %>
     tags: ['required-for-publish', 'run-on-pr']

.evergreen/tasks.yml

@@ -93,6 +93,14 @@ tasks:
       - func: install
       - func: bootstrap
       - func: publish-packages-next
+  - name: publish-dev-release
+    tags: []
+    depends_on:
+      - name: 'publish'
+        variant: '*'
+    commands:
+      - func: prepare
+      - func: publish-dev-release
 
   - name: package-compass
     tags: ['required-for-publish', 'run-on-pr']

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 Sun Jun 02 2024.
+This document was automatically generated on Tue Jun 04 2024.
 
 ## List of dependencies
 
@@ -243,7 +243,7 @@ This document was automatically generated on Sun Jun 02 2024.
 | **[ejson-shell-parser](#88e1a447c02d9ef3274034c023a5ebcec8188381b1bd951de7c57c140f7f3d4b)**                                 | 2.0.1        | MIT                                 |
 | **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)**                                        | 3.5.0        | MIT                                 |
 | **[electron-squirrel-startup](#09fb8168e8fda2e174f8d1a1c392ffd8f762c5637c788edd00d1e2486d060349)**                          | 1.0.1        | Apache-2.0                          |
-| **[electron](#df306ea54b07d931d1c03b5191c519ebc8a147cc5a1abc6d6e3bb58e36794e75)**                                           | 29.4.0       | MIT                                 |
+| **[electron](#8c7bbdce1cfd1d615c53adc4f9f00dfb196ba81f3534f7097879e0b49c4fb622)**                                           | 29.4.2       | MIT                                 |
 | **[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)**                                          | 1.0.2        | MIT                                 |
 | **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)**                                      | 1.4.4        | MIT                                 |
 | **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)**                                       | 3.0.1        | MIT                                 |
@@ -442,7 +442,7 @@ This document was automatically generated on Sun Jun 02 2024.
 | **[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)**                                                 | 2.1.3        | MIT                                 |
 | **[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)**                                   | 1.0.2        | MIT                                 |
 | **[negotiator](#e3856213d8f0a7d28cd4166e53ec7e2c019cb7becf4a8535097bac28d21e8579)**                                         | 0.6.3        | MIT                                 |
-| **[node-abi](#8e2613c563a94f0a2e56c1fdd062f129dd0bf82a76887714e08c291e6ace9dcc)**                                           | 3.62.0       | MIT                                 |
+| **[node-abi](#b0c567d1ffb85e3ed9bb2c7ff2a568c6e77163186b1560f1a476dd88695e10f1)**                                           | 3.63.0       | MIT                                 |
 | **[node-addon-api](#af9f7588524ca4e68f4efe7b24aea46d9c8004263b1d7cf3b558f86d87a163e8)**                                     | 4.3.0        | MIT                                 |
 | **[node-fetch](#364527ef1b51cc6ac34872b931049c9e25b5014f9b40e3898c84e1a830e21720)**                                         | 2.6.7        | MIT                                 |
 | **[node-fetch](#23d7d5a419e9a25e6384dee4aa24f7162544418f0cdc2d92e94e2cf924507b8c)**                                         | 2.7.0        | MIT                                 |
@@ -19963,9 +19963,9 @@ License files:
       See the License for the specific language governing permissions and
       limitations under the License.
 
-<a id="df306ea54b07d931d1c03b5191c519ebc8a147cc5a1abc6d6e3bb58e36794e75"></a>
+<a id="8c7bbdce1cfd1d615c53adc4f9f00dfb196ba81f3534f7097879e0b49c4fb622"></a>
 
-### [electron](https://www.npmjs.com/package/electron) (version 29.4.0)
+### [electron](https://www.npmjs.com/package/electron) (version 29.4.2)
 
 License tags: MIT
 
@@ -28766,9 +28766,9 @@ License files:
       TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
       SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-<a id="8e2613c563a94f0a2e56c1fdd062f129dd0bf82a76887714e08c291e6ace9dcc"></a>
+<a id="b0c567d1ffb85e3ed9bb2c7ff2a568c6e77163186b1560f1a476dd88695e10f1"></a>
 
-### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.62.0)
+### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.63.0)
 
 License tags: MIT
 

configs/webpack-config-compass/package.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -74,7 +74,7 @@
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^29.4.0",
+    "electron": "^29.4.2",
     "html-webpack-plugin": "^5.3.2",
     "less-loader": "^10.0.1",
     "mini-css-extract-plugin": "^2.3.0",