Skip to content
Merged
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
12 changes: 11 additions & 1 deletion .tekton/tasks/install-project-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,17 @@ spec:

if [ -n "$(params.npm-version)" ]; then
npm install npm@$(params.npm-version) -g
fi
fi

# Override yargs to v18 for Node 26+ (v17 has compatibility issues)
NODE_MAJOR=$(node -v | cut -d'.' -f1 | sed 's/v//')
if [ "$NODE_MAJOR" -ge 26 ]; then
echo "Node $NODE_MAJOR detected - overriding yargs to v18 for compatibility"
# Force reinstall with yargs v18 override
npm pkg set 'overrides.mocha.yargs=18.0.0'
npm install --package-lock-only
npm install
fi

if [ "$(params.skip-cache)" == "true" ]; then
echo "Skipping npm cache..."
Expand Down
8 changes: 6 additions & 2 deletions currencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,8 @@
"core": false,
"versions": [
{
"v": "2.1693.0"
"v": "2.1693.0",
"node": "<26"
}
]
},
Expand Down Expand Up @@ -1164,19 +1165,22 @@
"versions": [
{
"v": "7.8.0",
"node": ">=20.19.0 <23 || >=24",
"node": ">=20.19.0 <23 || >=24 <26",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prisma currently failing for v26, skipped for now. card: https://jsw.ibm.com/browse/INSTA-89970

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. Moved to blocked. Are they aware already?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No I will create a git issue later

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oki. I allow it.
👹

"skipValidation": true
},
{
"v": "6.19.0",
"node": "<26",
"skipValidation": true
},
{
"v": "4.16.2",
"node": "<26",
"skipValidation": true
},
{
"v": "4.5.0",
"node": "<26",
"skipValidation": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion native-dep-packs/build-and-copy-node-modules-linux
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function buildAndCopyModulesLinux {
-f "$dockerfile" \
--load -t "$dockertag" \
.
else if [[ "$arch" = "x64" ]]; then
elif [[ "$arch" = "x64" ]]; then
docker build \
--platform=linux/amd64 \
--build-arg BASE_IMAGE=$baseimage \
Expand Down
1 change: 1 addition & 0 deletions native-dep-packs/rebuild-precompiled-addons.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ declare -A ABI_VERSIONS=(
# ["131"]="23.0" \
["137"]="24.0"
# ["141"]="25.0" # Non-LTS (skipped intentionally)
["147"]="26.0"
)

LIBC_VARIANTS=(
Expand Down
23 changes: 8 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"mocha-multi-reporters": "1.5.1",
"moment": "2.30.1",
"morgan": "1.10.0",
"nan": "2.22.2",
"nan": "2.27.0",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nan v2.27.0 added support for v26

"node-gyp": "11.2.0",
"opentracing": "0.14.7",
"pino": "10.3.0",
Expand Down Expand Up @@ -171,14 +171,14 @@
},
"overrides": {
"prebuildify": {
"node-abi": "4.8.0"
"node-abi": "4.31.0"
},
"stream-shift": "1.0.2",
"event-loop-stats": {
"nan": "2.22.2"
"nan": "2.27.0"
},
"gcstats.js": {
"nan": "2.22.2"
"nan": "2.27.0"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion packages/autoprofile/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Supported arch:
node scripts/prebuilds.js --os=darwin --node=20.0.0 [build v20 only for darwin]
node scripts/prebuilds.js --os=linux --node=18.0.0 [build v18 only for linux]
node scripts/prebuilds.js --os=linux --arch=linux-arm64 --node=18.0.0 [build v18 only for linux arm64]
node scripts/prebuilds.js --node22.0.0 [build specific node version]
node scripts/prebuilds.js --node=22.0.0 [build specific node version]
node scripts/prebuilds.js --node=22.0.0,21.0.0 [build specific node versions]
```

Expand Down
2 changes: 1 addition & 1 deletion packages/autoprofile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"dependencies": {
"@instana/core": "5.4.3",
"detect-libc": "^2.1.2",
"nan": "^2.26.2",
"nan": "^2.27.0",
"node-gyp-build": "^4.8.4",
"semver": "^7.7.4"
},
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.