Skip to content

Commit 9b91c4e

Browse files
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 0f5dd7b + 4b50ea3 commit 9b91c4e

File tree

355 files changed

+4784
-4053
lines changed

Some content is hidden

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

355 files changed

+4784
-4053
lines changed

.evergreen/print-compass-env.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function printVar(name, value) {
2222
function printCompassEnv() {
2323
let {
2424
// This is an env var set in bash that we exported in print-compass-env.sh
25-
OSTYPE
25+
OSTYPE,
2626
} = process.env;
2727

2828
// We have to operate on bash's PATH env var where the c:\ style paths have
@@ -55,6 +55,13 @@ function printCompassEnv() {
5555

5656
const pathsToPrepend = [];
5757

58+
if (process.env.PLATFORM === 'linux') {
59+
// To build node modules on linux post electron 13 we need a newer c++
60+
// compiler version and at least python v3.9, this adds it.
61+
// https://jira.mongodb.org/browse/COMPASS-5150
62+
pathsToPrepend.unshift('/opt/devtools/bin');
63+
}
64+
5865
if (OSTYPE === 'cygwin') {
5966
// NOTE lucas: for git-core addition, See
6067
// https://jira.mongodb.org/browse/COMPASS-4122
@@ -68,13 +75,6 @@ function printCompassEnv() {
6875
pathsToPrepend.unshift(`${newPWD}/.deps/bin`);
6976
}
7077

71-
if (process.env.PLATFORM === 'linux') {
72-
// To build node modules on linux post electron 13 we need a newer c++
73-
// compiler version and at least python v3.9, this adds it.
74-
// https://jira.mongodb.org/browse/COMPASS-5150
75-
pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
76-
}
77-
7878
pathsToPrepend.unshift(`${originalPWD}/.evergreen/docker-config/bin`);
7979

8080
PATH = maybePrependPaths(PATH, pathsToPrepend);

.github/workflows/bump-packages.yaml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ jobs:
2424
with:
2525
# don't checkout a detatched HEAD
2626
ref: ${{ github.head_ref }}
27+
# this is important so git log can pick up on the whole history to
28+
# find last publish commit
29+
fetch-depth: '0'
2730
token: ${{ steps.app-token.outputs.token }}
2831

2932
- uses: actions/setup-node@v4
3033
with:
3134
node-version: 20.16.0
32-
cache: "npm"
35+
cache: 'npm'
3336

3437
- name: Install [email protected]
3538
run: |
@@ -42,17 +45,27 @@ jobs:
4245
4346
- name: Bump packages
4447
env:
45-
SKIP_BUMP_PACKAGES: "mongodb-compass"
48+
SKIP_BUMP_PACKAGES: 'mongodb-compass'
49+
# Do not remove this variable, bump-packages script uses this env var
50+
# to find the previous commit
51+
LAST_BUMP_COMMIT_MESSAGE: 'chore(release): bump package versions'
4652
run: npm run bump-packages
4753

4854
- name: Create Pull Request
4955
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
5056
with:
5157
token: ${{ steps.app-token.outputs.token }}
52-
commit-message: "chore(release): bump package versions"
58+
commit-message: 'chore(release): bump package versions'
5359
branch: ci/bump-packages
54-
title: "chore(release): bump package versions"
60+
title: 'chore(release): bump package versions'
5561
labels: no-title-validation
56-
author: "${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>"
57-
body: |
58-
- Bump package versions
62+
author: '${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>'
63+
body: >-
64+
<p>This PR is autogenerated and updates the version of every package
65+
in the monorepo that was changed since last publish. If you need to
66+
publish packages to update the version elsewhere, <strong>you can do
67+
this at your own convenience by just merging this PR</strong>.</p>
68+
69+
<p>After PR is merged, it starts an automatic publish process via
70+
GitHub Actions, you can follow the process <a href="https://github.com/mongodb-js/compass/actions/workflows/publish-packages.yaml">
71+
on the publish workflow page</a>.</p>

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ignoring templates for .yml files as they contain non-yaml syntax
2+
*.in.yml

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,4 @@ Niva Sivakumar <[email protected]>
101101
Will Ratner <[email protected]>
102102
Gagik Amaryan <[email protected]>
103103
Dylan Richardson <[email protected]>
104+
Ruby Dong <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 10 additions & 223 deletions
Large diffs are not rendered by default.

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.3.6",
3+
"version": "1.3.8",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -17,7 +17,7 @@
1717
"@babel/core": "^7.21.4",
1818
"@babel/eslint-parser": "^7.14.3",
1919
"@mongodb-js/eslint-config-devtools": "^0.9.9",
20-
"@mongodb-js/eslint-plugin-compass": "^1.2.6",
20+
"@mongodb-js/eslint-plugin-compass": "^1.2.8",
2121
"@typescript-eslint/eslint-plugin": "^5.59.0",
2222
"@typescript-eslint/parser": "^5.59.0",
2323
"eslint": "^7.25.0",

configs/eslint-plugin-compass/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.2.6",
16+
"version": "1.2.8",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,8 +37,8 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.6.6",
41-
"@mongodb-js/prettier-config-compass": "^1.2.6",
40+
"@mongodb-js/mocha-config-compass": "^1.6.8",
41+
"@mongodb-js/prettier-config-compass": "^1.2.8",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",
4444
"mocha": "^10.2.0",

configs/mocha-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@mongodb-js/mocha-config-compass",
3-
"version": "1.6.6",
3+
"version": "1.6.8",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",
77
"devDependencies": {
8-
"@mongodb-js/prettier-config-compass": "^1.2.6"
8+
"@mongodb-js/prettier-config-compass": "^1.2.8"
99
},
1010
"scripts": {
1111
"prettier": "prettier-compass",

configs/prettier-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/prettier-config-compass",
3-
"version": "1.2.6",
3+
"version": "1.2.8",
44
"description": "Shared Compass prettier configuration",
55
"license": "SSPL",
66
"main": "index.js",

configs/testing-library-compass/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
},
1313
"homepage": "https://github.com/mongodb-js/compass",
14-
"version": "1.2.6",
14+
"version": "1.2.8",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,10 +45,10 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.3.6",
49-
"@mongodb-js/mocha-config-compass": "^1.6.6",
50-
"@mongodb-js/prettier-config-compass": "^1.2.6",
51-
"@mongodb-js/tsconfig-compass": "^1.2.6",
48+
"@mongodb-js/eslint-config-compass": "^1.3.8",
49+
"@mongodb-js/mocha-config-compass": "^1.6.8",
50+
"@mongodb-js/prettier-config-compass": "^1.2.8",
51+
"@mongodb-js/tsconfig-compass": "^1.2.8",
5252
"@types/chai": "^4.2.21",
5353
"@types/mocha": "^9.0.0",
5454
"@types/sinon-chai": "^3.2.5",

0 commit comments

Comments
 (0)