Skip to content

Commit d0adbd4

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 34b0ae0 + 83d7efb commit d0adbd4

File tree

63 files changed

+1635
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1635
-402
lines changed

‎.evergreen/functions.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ variables:
8383

8484
# This is here with the variables because anchors aren't supported across includes
8585
post:
86+
- command: shell.exec
87+
params:
88+
working_dir: src
89+
shell: bash
90+
script: |
91+
tar czvf all-e2e-logs.tgz packages/compass-e2e-tests/.log
8692
- command: s3.put
8793
params:
8894
<<: *save-artifact-params-private
@@ -92,6 +98,7 @@ post:
9298
- src/packages/compass-e2e-tests/.nyc_output/coverage.json
9399
- src/.testserver/logs/*
94100
- src/.evergreen/logs/*
101+
- src/all-e2e-logs.tgz
95102
remote_file: ${project}/${revision}_${revision_order_id}/${build_variant}/${task_name}
96103
content_type: text/plain
97104
- command: s3.put
@@ -367,7 +374,7 @@ functions:
367374
sleep 20
368375
done
369376
echo "SSH connection established after $attempts attempts"
370-
377+
371378
# Write the host info so that it can be used by the signing tool
372379
if [[ $OSTYPE == "cygwin" ]]; then
373380
identity_file=$(cygpath -wa "$identity_file")
@@ -566,7 +573,7 @@ functions:
566573
tar -xvz)
567574
export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
568575
npm run test-csfle --workspace mongodb-data-service
569-
576+
570577
verify-artifacts:
571578
- command: shell.exec
572579
params:

‎.evergreen/tasks.in.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ tasks:
108108
- func: spawn-signing-server
109109
- func: package
110110
vars:
111-
debug: 'hadron*,mongo*,compass*,electron*'
111+
debug: 'hadron*,mongo*,compass*,electron*,sign*'
112112
compass_distribution: <% out(packageTask.vars.compass_distribution) %>
113113
- func: verify-artifacts
114114
- func: save-all-artifacts

‎.evergreen/tasks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ tasks:
108108
- func: spawn-signing-server
109109
- func: package
110110
vars:
111-
debug: 'hadron*,mongo*,compass*,electron*'
111+
debug: 'hadron*,mongo*,compass*,electron*,sign*'
112112
compass_distribution: compass
113113
- func: verify-artifacts
114114
- func: save-all-artifacts
@@ -129,7 +129,7 @@ tasks:
129129
- func: spawn-signing-server
130130
- func: package
131131
vars:
132-
debug: 'hadron*,mongo*,compass*,electron*'
132+
debug: 'hadron*,mongo*,compass*,electron*,sign*'
133133
compass_distribution: compass-readonly
134134
- func: verify-artifacts
135135
- func: save-all-artifacts
@@ -150,7 +150,7 @@ tasks:
150150
- func: spawn-signing-server
151151
- func: package
152152
vars:
153-
debug: 'hadron*,mongo*,compass*,electron*'
153+
debug: 'hadron*,mongo*,compass*,electron*,sign*'
154154
compass_distribution: compass-isolated
155155
- func: verify-artifacts
156156
- func: save-all-artifacts

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Sun Feb 04 2024.
2+
This document was automatically generated on Wed Feb 07 2024.
33

44
## List of dependencies
55

@@ -249,7 +249,7 @@ This document was automatically generated on Sun Feb 04 2024.
249249
| **[ejson-shell-parser](#1d4694ba430009acb84cb34d7d2f60a89bdb1f8fc199574ccb0c34b6c7e389a7)** | 2.0.0 | MIT |
250250
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
251251
| **[electron-squirrel-startup](#dcda22e402581a033ec2a017d6d05c094bf3173c1b03ae0471b2ce9078d3f601)** | 1.0.0 | Apache-2.0 |
252-
| **[electron](#2de45e41f5577aa71213bc8c5095fe939c208102aca1fddf1dfd1ba10c6d3558)** | 28.2.0 | MIT |
252+
| **[electron](#fbe31ba116fedfb4c83039ff76fc6f1f617048e031e4b0f3bf2bf6a9102389f1)** | 28.2.1 | MIT |
253253
| **[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)** | 1.0.2 | MIT |
254254
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
255255
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -517,7 +517,7 @@ This document was automatically generated on Sun Feb 04 2024.
517517
| **[select](#12d30053a00882385c42a50004536696d477e8e694b047d6d39513947e5a39e9)** | 1.1.2 | MIT |
518518
| **[semver](#130ff131d535cf175f11d330a68bae2ca388d0e168139f383a353ced45a36f0a)** | 5.7.2 | ISC |
519519
| **[semver](#8b8f657069cf84b7ca932ab17eb24a0a55a8053ccd2a36c03185dadab64db3f8)** | 6.3.1 | ISC |
520-
| **[semver](#c2244b3979a8f8d37bf67622a3fcc46bf41a0bb61410aa8a0d38b2070d212612)** | 7.5.4 | ISC |
520+
| **[semver](#91fed21fcd28c91926ebe4e1967f2215934bb8253962246c6ec07b1c308ec8ef)** | 7.6.0 | ISC |
521521
| **[send](#a5aa96052b8bf57c58c38d6fae3a3b7d94ec212b6100f58a8260eb2f6a8cff6d)** | 0.18.0 | MIT |
522522
| **[serve-static](#03156d123ff3a9482fa09d97af4668d5e2ae058c4e3d2c67fe4a1c0c072403f0)** | 1.15.0 | MIT |
523523
| **[set-function-length](#91327f15932c462b17bb319eacea5846908823dfbc11211872596598a8e6146a)** | 1.1.1 | MIT |
@@ -21058,9 +21058,9 @@ License files:
2105821058
See the License for the specific language governing permissions and
2105921059
limitations under the License.
2106021060

21061-
<a id="2de45e41f5577aa71213bc8c5095fe939c208102aca1fddf1dfd1ba10c6d3558"></a>
21061+
<a id="fbe31ba116fedfb4c83039ff76fc6f1f617048e031e4b0f3bf2bf6a9102389f1"></a>
2106221062

21063-
### [electron](https://www.npmjs.com/package/electron) (version 28.2.0)
21063+
### [electron](https://www.npmjs.com/package/electron) (version 28.2.1)
2106421064

2106521065
License tags: MIT
2106621066

@@ -38499,9 +38499,9 @@ License files:
3849938499
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
3850038500
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3850138501

38502-
<a id="c2244b3979a8f8d37bf67622a3fcc46bf41a0bb61410aa8a0d38b2070d212612"></a>
38502+
<a id="91fed21fcd28c91926ebe4e1967f2215934bb8253962246c6ec07b1c308ec8ef"></a>
3850338503

38504-
### [semver](https://www.npmjs.com/package/semver) (version 7.5.4)
38504+
### [semver](https://www.npmjs.com/package/semver) (version 7.6.0)
3850538505

3850638506
License tags: ISC
3850738507

‎configs/webpack-config-compass/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^28.1.4",
77+
"electron": "^28.2.1",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less-loader": "^10.0.1",
8080
"mini-css-extract-plugin": "^2.3.0",

0 commit comments

Comments
 (0)