Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: bump default build tools to vs2022 for Windows MONGOSH-1648 #51

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ functions:
shell: bash
env:
TEST_NODE_VERSION: ${node_version}
OKTA_TEST_CONFIG: ${okta_test_config}
OKTA_TEST_CREDENTIALS: ${okta_test_credentials}
AZURE_TEST_CONFIG: ${azure_test_config}
AZURE_TEST_CREDENTIALS: ${azure_test_credentials}
DISTRO_ID: ${distro_id}
script: |
set -e
Expand All @@ -70,43 +66,39 @@ functions:
export BOXEDNODE_CONFIGURE_ARGS='--openssl-no-asm'
fi

if [ "$OS" != "Windows_NT" ]; then
export PATH="/opt/mongodbtoolchain/v4/bin:$PATH"
fi

. .evergreen/use-node.sh
npm run build
TEST_NODE_VERSION="$TEST_NODE_VERSION" npm run test-ci

tasks:
- name: test_n14
commands:
- func: checkout
- func: install_node
- func: install
- func: test
vars:
node_version: "14.21.3"
- name: test_n16
- name: test_n18
commands:
- func: checkout
- func: install_node
- func: install
- func: test
vars:
node_version: "16.20.1"
- name: test_n18
node_version: "18.17.0"
- name: test_n20
commands:
- func: checkout
- func: install_node
- func: install
- func: test
vars:
node_version: "18.17.0"
- name: test_n20
node_version: "20.13.0"
- name: test_n22
commands:
- func: checkout
- func: install_node
- func: install
- func: test
vars:
node_version: "20.13.0"
node_version: "22.11.0"
- name: check
commands:
- func: checkout
Expand All @@ -119,32 +111,28 @@ buildvariants:
display_name: 'Ubuntu 20.04 x64'
run_on: ubuntu2004-large
tasks:
- test_n14
- test_n16
- test_n18
- test_n20
- test_n22
- check
- name: macos_x64_test
display_name: 'macOS 11.00 x64'
run_on: macos-1100
display_name: 'macOS 14 x64'
run_on: macos-14
tasks:
- test_n14
- test_n16
- test_n18
- test_n20
- test_n22
- name: macos_arm64_test
display_name: 'macOS 11.00 arm64'
run_on: macos-1100-arm64
display_name: 'macOS 14 arm64'
run_on: macos-14-arm64
tasks:
- test_n14
- test_n16
- test_n18
- test_n20
- test_n22
- name: windows_x64_test
display_name: 'Windows x64'
run_on: windows-vsCurrent-xlarge
run_on: windows-vsCurrent-2022-large
tasks:
- test_n14
- test_n16
- test_n18
- test_n20
- test_n22
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
node-version: [14.x, 16.x, 18.x, 20.x]
node-version: [18.x, 20.x, 22.x]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ async function compileNode (
// conflicting arguments have been passed manually.
const vcbuildArgs: string[] = [...buildArgs, ...makeArgs, 'projgen'];
if (!vcbuildArgs.includes('debug') && !vcbuildArgs.includes('release')) { vcbuildArgs.push('release'); }
if (!vcbuildArgs.some((arg) => /^vs/.test(arg))) { vcbuildArgs.push('vs2019'); }
if (!vcbuildArgs.some((arg) => /^vs/.test(arg))) { vcbuildArgs.push('vs2022'); }

for (const module of linkedJSModules) {
vcbuildArgs.push('link-module', module);
Expand Down
Loading