Skip to content

Commit 0573d21

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 67abcd9 + f9efb8a commit 0573d21

File tree

15 files changed

+42
-43
lines changed

15 files changed

+42
-43
lines changed

.evergreen/connectivity-tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# "bullseye" is the debian distribution that ubuntu:20.04 is based on
2-
ARG NODE_JS_VERSION=20
2+
ARG NODE_JS_VERSION=22
33
FROM node:${NODE_JS_VERSION}-bullseye
44

55
COPY .evergreen/connectivity-tests/krb5.conf /etc/krb5.conf

.evergreen/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variables:
4040
EVERGREEN_VERSION_ID: ${version_id}
4141
EVERGREEN_WORKDIR: ${workdir}
4242
EVERGREEN_CREATED_AT: ${created_at}
43-
NODE_JS_VERSION: '20.16.0'
43+
NODE_JS_VERSION: '22.15.1'
4444
NPM_VERSION: '10.2.4'
4545
# secrets
4646
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}

.evergreen/preinstall.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [ -n "$IS_WINDOWS" ]; then
3939
rm -rf node-v$NODE_JS_VERSION-win-$ARCH
4040

4141
echo "Installing npm@$NPM_VERSION..."
42-
rm -rf npm npx npm.cmd npx.cmd
42+
rm -rf npm npx npm.cmd npx.cmd npm.ps1 npx.ps1
4343
mv node_modules/npm node_modules/npm2
4444
chmod +x ./node.exe
4545

.github/workflows/authors-and-third-party-notices.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- uses: actions/setup-node@v4
4242
with:
43-
node-version: 20.16.0
43+
node-version: 22.15.1
4444
cache: 'npm'
4545

4646
- name: Install [email protected]

.github/workflows/bump-packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- uses: actions/setup-node@v4
3333
with:
34-
node-version: 20.16.0
34+
node-version: 22.15.1
3535
cache: 'npm'
3636

3737
- name: Install [email protected]

.github/workflows/publish-compass.yaml

Lines changed: 5 additions & 5 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

@@ -25,8 +25,8 @@ jobs:
2525
- name: Setup Node.js Environment
2626
uses: actions/setup-node@v4
2727
with:
28-
node-version: 20.16.0
29-
cache: "npm"
28+
node-version: 22.15.1
29+
cache: 'npm'
3030

3131
- name: Install [email protected]
3232
run: |
@@ -39,7 +39,7 @@ jobs:
3939
4040
- name: Upload updated download center manifest
4141
env:
42-
DEBUG: "hadron*,mongo*,compass*"
42+
DEBUG: 'hadron*,mongo*,compass*'
4343
DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID: ${{ secrets.DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID }}
4444
DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY: ${{ secrets.DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY }}
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-packages.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ jobs:
2727
ref: ${{ github.head_ref }}
2828

2929
# this is important so git log has the whole history
30-
fetch-depth: "0"
30+
fetch-depth: '0'
3131

3232
- name: Setup git
3333
run: |
3434
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
3535
git config --local user.name "github-actions[bot]"
3636
37-
- name: "Use Node.js 20"
37+
- name: 'Use Node.js'
3838
uses: actions/setup-node@v4
3939
with:
40-
node-version: 20.16.0
40+
node-version: 22.15.1
4141

4242
- name: Install [email protected]
4343
run: npm install -g [email protected]
@@ -47,7 +47,7 @@ jobs:
4747
npm run bootstrap-ci
4848
shell: bash
4949

50-
- name: "Publish what is not already in NPM"
50+
- name: 'Publish what is not already in NPM'
5151
env:
5252
NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }}
5353
run: |
@@ -57,7 +57,7 @@ jobs:
5757
git update-index --assume-unchanged .npmrc
5858
npm run publish-packages
5959
60-
- name: "Publish tags"
60+
- name: 'Publish tags'
6161
run: |
6262
npx lerna list --json | \
6363
jq -r '.[] | .name + "@" + .version' | \

.github/workflows/start-beta.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ 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
permissions:
1818
contents: write # To create the new branch and push it
@@ -33,8 +33,8 @@ jobs:
3333
3434
- uses: actions/setup-node@v4
3535
with:
36-
node-version: 20.16.0
37-
cache: "npm"
36+
node-version: 22.15.1
37+
cache: 'npm'
3838

3939
- name: Install [email protected]
4040
run: |

.github/workflows/start-ga.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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
permissions:
@@ -33,8 +33,8 @@ jobs:
3333
3434
- uses: actions/setup-node@v4
3535
with:
36-
node-version: 20.16.0
37-
cache: "npm"
36+
node-version: 22.15.1
37+
cache: 'npm'
3838

3939
- name: Install [email protected]
4040
run: |

.github/workflows/test-installers.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ jobs:
132132
- hadron-distribution: compass-readonly
133133
test: auto-update-to
134134

135-
136135
# TODO(COMPASS-9067): auto-update-from does not work for windows. Not
137136
# even manually. It downloads the releases file, the toast appears
138137
# that says it is downloading the update, the log appears that says
@@ -177,8 +176,8 @@ jobs:
177176
- name: Setup Node.js
178177
uses: actions/setup-node@v4
179178
with:
180-
node-version: 20
181-
cache: "npm"
179+
node-version: 22
180+
cache: 'npm'
182181

183182
- name: Run post-checkout command
184183
if: matrix.post-checkout-command
@@ -231,8 +230,8 @@ jobs:
231230
GITHUB_TOKEN: ${{ github.token }}
232231
# mongodb 8.0.6 requires macOS 14+. Just use an older version for now
233232
# so it will run on GitHub's mac runners
234-
MONGODB_VERSION: "8.0.5"
235-
MONGODB_RUNNER_VERSION: "8.0.5"
233+
MONGODB_VERSION: '8.0.5'
234+
MONGODB_RUNNER_VERSION: '8.0.5'
236235
working-directory: packages/compass-smoke-tests
237236
# Using --skipUninstalling --skipCleanup because the runners are ephemeral
238237
run: npm start -- --package ${{ matrix.package }} --tests ${{ matrix.test }} --skipUninstall --skipCleanup

0 commit comments

Comments
 (0)