Skip to content

Commit 14ba6d4

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents af92cfc + fd2a0b5 commit 14ba6d4

File tree

108 files changed

+3388
-3035
lines changed

Some content is hidden

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

108 files changed

+3388
-3035
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "main", '*-releases' ]
17-
tags: [ 'v*' ]
16+
branches: ["main", "*-releases"]
17+
tags: ["v*"]
1818
pull_request:
1919
# The branches below must be a subset of the branches above
20-
branches: [ "main" ]
20+
branches: ["main"]
2121
schedule:
22-
- cron: '30 14 * * 4'
22+
- cron: "30 14 * * 4"
2323
workflow_dispatch:
2424
inputs: {}
2525

@@ -36,53 +36,53 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
language: [ 'go', 'javascript', 'python' ]
39+
language: ["go", "javascript", "python"]
4040
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
4141
# Use only 'java' to analyze code written in Java, Kotlin or both
4242
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
4343
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
4444

4545
steps:
46-
- name: Checkout repository
47-
uses: actions/checkout@v3
46+
- name: Checkout repository
47+
uses: actions/checkout@v4
4848

49-
# Initializes the CodeQL tools for scanning.
50-
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v2
52-
with:
53-
languages: ${{ matrix.language }}
54-
# If you wish to specify custom queries, you can do so here or in a config file.
55-
# By default, queries listed here will override any specified in a config file.
56-
# Prefix the list here with "+" to use these queries and those in the config file.
49+
# Initializes the CodeQL tools for scanning.
50+
- name: Initialize CodeQL
51+
uses: github/codeql-action/init@v2
52+
with:
53+
languages: ${{ matrix.language }}
54+
# If you wish to specify custom queries, you can do so here or in a config file.
55+
# By default, queries listed here will override any specified in a config file.
56+
# Prefix the list here with "+" to use these queries and those in the config file.
5757

58-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
59-
queries: security-extended
60-
config: |
61-
paths-ignore:
62-
- '**/*.test.js'
63-
- '**/*.spec.js'
64-
- '**/*.test.ts'
65-
- '**/*.spec.ts'
66-
- '**/*.test.tsx'
67-
- '**/*.spec.tsx'
68-
- 'scripts/**'
58+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
59+
queries: security-extended
60+
config: |
61+
paths-ignore:
62+
- '**/*.test.js'
63+
- '**/*.spec.js'
64+
- '**/*.test.ts'
65+
- '**/*.spec.ts'
66+
- '**/*.test.tsx'
67+
- '**/*.spec.tsx'
68+
- 'scripts/**'
6969
70-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
71-
# If this step fails, then you should remove it and run the build manually (see below)
72-
- name: Autobuild
73-
uses: github/codeql-action/autobuild@v2
70+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
71+
# If this step fails, then you should remove it and run the build manually (see below)
72+
- name: Autobuild
73+
uses: github/codeql-action/autobuild@v2
7474

75-
# ℹ️ Command-line programs to run using the OS shell.
76-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
75+
# ℹ️ Command-line programs to run using the OS shell.
76+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
7777

78-
# If the Autobuild fails above, remove it and uncomment the following three lines.
79-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
78+
# If the Autobuild fails above, remove it and uncomment the following three lines.
79+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
8080

81-
# - run: |
82-
# echo "Run, Build Application using script"
83-
# ./location_of_script_within_repo/buildscript.sh
81+
# - run: |
82+
# echo "Run, Build Application using script"
83+
# ./location_of_script_within_repo/buildscript.sh
8484

85-
- name: Perform CodeQL Analysis
86-
uses: github/codeql-action/analyze@v2
87-
with:
88-
category: "/language:${{matrix.language}}"
85+
- name: Perform CodeQL Analysis
86+
uses: github/codeql-action/analyze@v2
87+
with:
88+
category: "/language:${{matrix.language}}"

‎.github/workflows/publish-compass.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
workflow_dispatch:
66
inputs:
77
dryRun:
8-
description: 'Run publish in dry-run mode (WARN: think twice when changing this value, this will override currently published manifest in download center!)'
8+
description: "Run publish in dry-run mode (WARN: think twice when changing this value, this will override currently published manifest in download center!)"
99
required: true
10-
default: 'true'
10+
default: "true"
1111
release:
1212
types: [published]
1313

@@ -17,13 +17,13 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Setup Node.js Environment
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20.16.0
26-
cache: 'npm'
26+
cache: "npm"
2727

2828
- name: Install [email protected]
2929
run: |
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: Upload updated download center manifest
3838
env:
39-
DEBUG: 'hadron*,mongo*,compass*'
39+
DEBUG: "hadron*,mongo*,compass*"
4040
DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID: ${{ secrets.DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID }}
4141
DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY: ${{ secrets.DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY }}
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/publish-packages.yaml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,45 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
with:
23-
# don't checkout a detatched HEAD
24-
ref: ${{ github.head_ref }}
25-
26-
# this is important so git log has the whole history
27-
fetch-depth: '0'
28-
29-
- name: Setup git
30-
run: |
31-
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
32-
git config --local user.name "github-actions[bot]"
33-
34-
- name: "Use Node.js 14"
35-
uses: actions/setup-node@v3
36-
with:
37-
node-version: 20.16.0
38-
39-
- name: Install [email protected]
40-
run: npm install -g [email protected]
41-
42-
- name: Install Dependencies
43-
run: |
44-
npm run bootstrap-ci
45-
shell: bash
46-
47-
- name: "Publish what is not already in NPM"
48-
env:
49-
NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }}
50-
run: |
51-
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
52-
npm config list
53-
echo "Publishing packages as $(npm whoami)"
54-
git update-index --assume-unchanged .npmrc
55-
npm run publish-packages
56-
57-
- name: "Publish tags"
58-
run: |
59-
npx lerna list -a --json | \
60-
jq -r '.[] | .name + "@" + .version' | \
61-
xargs -i sh -c "git tag -a {} -m {} || true"
62-
git push --follow-tags
21+
- uses: actions/checkout@v4
22+
with:
23+
# don't checkout a detatched HEAD
24+
ref: ${{ github.head_ref }}
25+
26+
# this is important so git log has the whole history
27+
fetch-depth: "0"
28+
29+
- name: Setup git
30+
run: |
31+
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
32+
git config --local user.name "github-actions[bot]"
33+
34+
- name: "Use Node.js 20"
35+
uses: actions/setup-node@v4
36+
with:
37+
node-version: 20.16.0
38+
39+
- name: Install [email protected]
40+
run: npm install -g [email protected]
41+
42+
- name: Install Dependencies
43+
run: |
44+
npm run bootstrap-ci
45+
shell: bash
46+
47+
- name: "Publish what is not already in NPM"
48+
env:
49+
NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }}
50+
run: |
51+
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
52+
npm config list
53+
echo "Publishing packages as $(npm whoami)"
54+
git update-index --assume-unchanged .npmrc
55+
npm run publish-packages
56+
57+
- name: "Publish tags"
58+
run: |
59+
npx lerna list -a --json | \
60+
jq -r '.[] | .name + "@" + .version' | \
61+
xargs -i sh -c "git tag -a {} -m {} || true"
62+
git push --follow-tags

‎.github/workflows/start-beta.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ on:
55
inputs:
66
mergeBranch:
77
description: 'mergeBranch (optional, default="main"): the branch to merge from, useful to perform quick fixes outside of main.'
8-
default: 'main'
8+
default: "main"
99
required: false
1010
overrideNextGa:
11-
description: 'overrideNextGa (optional): set this param if you want to override the nextGa version that is fetched from jira versions, and use a different one.'
11+
description: "overrideNextGa (optional): set this param if you want to override the nextGa version that is fetched from jira versions, and use a different one."
1212
required: false
1313
schedule:
1414
# Each Monday at 5 AM UTC
15-
- cron: '0 5 * * 1'
15+
- cron: "0 5 * * 1"
1616

1717
jobs:
1818
startRelease:
1919
name: Start new Beta release
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525
- name: Setup git
2626
run: |
2727
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
2828
git config --local user.name "github-actions[bot]"
2929
30-
- uses: actions/setup-node@v3
30+
- uses: actions/setup-node@v4
3131
with:
3232
node-version: 20.16.0
33-
cache: 'npm'
33+
cache: "npm"
3434

3535
- name: Install [email protected]
3636
run: |

‎.github/workflows/start-ga.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ on:
77
workflow_dispatch:
88
inputs:
99
releaseTicket:
10-
description: 'releaseTicket (required): it must have a fixVersion which will be used as release version.'
10+
description: "releaseTicket (required): it must have a fixVersion which will be used as release version."
1111
required: true
1212
mergeBranch:
1313
description: 'mergeBranch (optional, default="beta-releases"): the branch to merge from, useful to perform quick fixes or to skip beta.'
14-
default: 'beta-releases'
14+
default: "beta-releases"
1515
required: false
1616

1717
jobs:
1818
startRelease:
1919
name: Start new GA release
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525
- name: Setup git
2626
run: |
2727
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
2828
git config --local user.name "github-actions[bot]"
2929
30-
- uses: actions/setup-node@v3
30+
- uses: actions/setup-node@v4
3131
with:
3232
node-version: 20.16.0
33-
cache: 'npm'
33+
cache: "npm"
3434

3535
- name: Install [email protected]
3636
run: |
@@ -43,7 +43,6 @@ jobs:
4343
4444
- name: Start Release
4545
env:
46-
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
4746
GH_TOKEN: ${{ github.token }}
4847
run: |
4948
node scripts/release.js ga \

‎.github/workflows/update-electron.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
with:
2323
# don't checkout a detatched HEAD
2424
ref: ${{ github.head_ref }}
25+
token: ${{ steps.app-token.outputs.token }}
2526

2627
- uses: actions/setup-node@v4
2728
with:
@@ -48,3 +49,4 @@ jobs:
4849
labels: no-title-validation
4950
body: |
5051
- Update electron
52+
author: "${{ steps.app-token.outputs.app-slug }}[bot]"

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 1 addition & 1 deletion
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 Jan 05 2025.
2+
This document was automatically generated on Sun Jan 12 2025.
33

44
## List of dependencies
55

‎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.1.9",
3+
"version": "1.2.0",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.0.23",
19+
"@mongodb-js/eslint-plugin-compass": "^1.1.0",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.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.0.23",
16+
"version": "1.1.0",
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.4.4",
41-
"@mongodb-js/prettier-config-compass": "^1.0.4",
40+
"@mongodb-js/mocha-config-compass": "^1.5.0",
41+
"@mongodb-js/prettier-config-compass": "^1.1.0",
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.4.4",
3+
"version": "1.5.0",
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.0.4",
8+
"@mongodb-js/prettier-config-compass": "^1.1.0",
99
"prettier": "^2.7.1"
1010
},
1111
"scripts": {

0 commit comments

Comments
 (0)