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

mongodb-js · Jun 10, 2024 · 8175a89 · 8175a89
2 parents 5e2a1c0 + a0ad35d
commit 8175a89
Show file tree

Hide file tree

Showing 85 changed files with 3,685 additions and 2,420 deletions.
diff --git a/.evergreen/build-dev-release-info.sh b/.evergreen/build-dev-release-info.sh
@@ -0,0 +1,34 @@
+#! /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
+
+JSON_CONTENT=$( jq -n \
+  --arg id "$DEV_VERSION_IDENTIFIER" \
+  --arg key "${EVERGREEN_REVISION}_${EVERGREEN_REVISION_ORDER_ID}" \
+  '{version: $id, bucket_key_prefix: $key}'
+)
+
+URL="https://mciuploads.s3.amazonaws.com/${EVERGREEN_PROJECT}/compass/dev/$1"
+DATA=$(curl -sf "${URL}" || echo "$JSON_CONTENT")
+CURRENT_VERSION=$(echo "$DATA" | jq -r '.version')
+
+echo "Comparing versions: $CURRENT_VERSION and $DEV_VERSION_IDENTIFIER"
+LATEST_VERSION=$(npx semver "$CURRENT_VERSION" "$DEV_VERSION_IDENTIFIER" | tail -n1 | xargs)
+
+if [[ "$LATEST_VERSION" == "$CURRENT_VERSION" ]]; then
+  echo "Skipping publishing dev release, version $DEV_VERSION_IDENTIFIER is not newer than $CURRENT_VERSION"
+  exit 0
+fi
+
+echo "$JSON_CONTENT" > "$1"
diff --git a/.evergreen/buildvariants.in.yml b/.evergreen/buildvariants.in.yml
@@ -17,7 +17,7 @@ buildvariants:
     tasks:
       - name: publish
       - name: publish-packages-next
-      - name: publish-dev-release
+      - name: publish-dev-release-info
 
   - name: ubuntu_connectivity_tests
     display_name: Connectivity Tests

diff --git a/.evergreen/buildvariants.yml b/.evergreen/buildvariants.yml
@@ -17,7 +17,7 @@ buildvariants:
     tasks:
       - name: publish
       - name: publish-packages-next
-      - name: publish-dev-release
+      - name: publish-dev-release-info
 
   - name: ubuntu_connectivity_tests
     display_name: Connectivity Tests

diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml
@@ -33,6 +33,7 @@ variables:
     EVERGREEN_IS_PATCH: ${is_patch}
     EVERGREEN_PROJECT: ${project}
     EVERGREEN_REVISION: ${revision}
+    EVERGREEN_REVISION_ORDER_ID: ${revision_order_id}
     EVERGREEN_TASK_ID: ${task_id}
     EVERGREEN_TASK_NAME: ${task_name}
     EVERGREEN_TASK_URL: https://evergreen.mongodb.com/task/${task_id}
@@ -443,7 +444,7 @@ functions:
           echo "Uploading release assets to S3 and GitHub if needed..."
           npm run --workspace mongodb-compass upload
 
-  publish-dev-release:
+  publish-dev-release-info:
     - command: shell.exec
       params:
         working_dir: src
@@ -452,14 +453,14 @@ functions:
           <<: *compass-env
         script: |
           eval $(.evergreen/print-compass-env.sh)
-          .evergreen/publish-dev-release.sh LATEST
+          .evergreen/build-dev-release-info.sh release.json
     - 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
+        local_file: src/release.json
+        remote_file: ${project}/compass/dev/release.json
+        content_type: application/json
+        display_name: release.json
         optional: true
 
   get-packaged-app:

diff --git a/.evergreen/print-compass-env.js b/.evergreen/print-compass-env.js
@@ -105,6 +105,8 @@ function printCompassEnv() {
   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);
+  printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
+  printVar('EVERGREEN_REVISION_ORDER_ID', process.env.EVERGREEN_REVISION_ORDER_ID);
 }
 
 printCompassEnv();
diff --git a/.evergreen/publish-dev-release.sh b/.evergreen/publish-dev-release.sh
diff --git a/.evergreen/tasks.in.yml b/.evergreen/tasks.in.yml
@@ -93,14 +93,14 @@ tasks:
       - func: install
       - func: bootstrap
       - func: publish-packages-next
-  - name: publish-dev-release
+  - name: publish-dev-release-info
     tags: []
     depends_on:
       - name: 'publish'
         variant: '*'
     commands:
       - func: prepare
-      - func: publish-dev-release
+      - func: publish-dev-release-info
 <% for (const packageTask of tasks.package) { %>
   - name: <% out(packageTask.name) %>
     tags: ['required-for-publish', 'run-on-pr']

diff --git a/.evergreen/tasks.yml b/.evergreen/tasks.yml
@@ -93,14 +93,14 @@ tasks:
       - func: install
       - func: bootstrap
       - func: publish-packages-next
-  - name: publish-dev-release
+  - name: publish-dev-release-info
     tags: []
     depends_on:
       - name: 'publish'
         variant: '*'
     commands:
       - func: prepare
-      - func: publish-dev-release
+      - func: publish-dev-release-info
 
   - name: package-compass
     tags: ['required-for-publish', 'run-on-pr']

diff --git a/AUTHORS b/AUTHORS
@@ -87,3 +87,4 @@ Alena Khineika <[email protected]>
 Mingjun Yin <[email protected]>
 Ben Radcliffe <[email protected]>
 Betsy Button <[email protected]>
+Vivian Xiao <[email protected]>