Skip to content

Revert "ci: cap supported next version to be <15.4.1 (#6094)" #6096

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.

Sign up for GitHub

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −8
Draft

Revert "ci: cap supported next version to be <15.4.1 (#6094)" #6096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c40ea8c
Revert "ci: cap supported next version to be <15.4.1 (#6094)"
watson Jul 15, 2025
eb17741
Also revert parts of PR #6098
watson Jul 17, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/apm-integrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ jobs:
version:
- 18
- latest
range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1']
range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
include:
- range: '>=10.2.0 <11'
range_clean: gte.10.2.0.and.lt.11
Expand All @@ -770,7 +770,7 @@ jobs:
range_clean: gte.14.0.0.and.lte.14.2.6
- range: '>=14.2.7 <15'
range_clean: gte.14.2.7.and.lt.15
- range: '>=15.0.0 <15.4.1'
- range: '>=15.0.0'
range_clean: gte.15.0.0
runs-on: ubuntu-latest
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/appsec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ jobs:
version:
- oldest
- latest
range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1']
range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
include:
- range: '>=10.2.0 <11'
range_clean: gte.10.2.0.and.lt.11
Expand All @@ -232,7 +232,7 @@ jobs:
range_clean: gte.14.0.0.and.lte.14.2.6
- range: '>=14.2.7 <15'
range_clean: gte.14.2.7.and.lt.15
- range: '>=15.0.0 <15.4.1'
- range: '>=15.0.0'
range_clean: gte.15.0.0
runs-on: ubuntu-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-plugin-next/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Plugin', function () {
const satisfiesStandalone = version => satisfies(version, '>=12.0.0')

// TODO: Figure out why 10.x tests are failing.
withVersions('next', 'next', '>=11.1 <15.4.1', version => {
withVersions('next', 'next', '>=11.1', version => {
const pkg = require(`../../../versions/next@${version}/node_modules/next/package.json`)

const startServer = ({ withConfig, standalone }, schemaVersion = 'v0', defaultToGlobalService = false) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-plugin-next/test/integration-test/client.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('esm', () => {
let proc
let sandbox
// match versions tested with unit tests
withVersions('next', 'next', '>=11.1 <15.4.1', version => {
withVersions('next', 'next', '>=11.1', version => {
before(async function () {
// next builds slower in the CI, match timeout with unit tests
this.timeout(300 * 1000)
Expand Down
2 changes: 1 addition & 1 deletion packages/dd-trace/test/appsec/index.next.plugin.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('test suite', () => {

const satisfiesStandalone = version => satisfies(version, '>=12.0.0')

withVersions('next', 'next', '>=11.1 <15.4.1', version => {
withVersions('next', 'next', '>=11.1', version => {
if (version === '>=11.0.0 <13' && NODE_MAJOR === 24 &&
NODE_MINOR === 0 && NODE_PATCH === 0) {
return // node 24.0.0 fails, but 24.0.1 works
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-ci-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function checkPlugins (yamlPath) {
const instRanges = Array.from(rangesPerPluginFromInst[pluginName])
const yamlVersions = getMatchingVersions(pluginName, yamlRanges)
const instVersions = getMatchingVersions(pluginName, instRanges)
if (pluginName !== 'next' && !util.isDeepStrictEqual(yamlVersions, instVersions)) {
if (!util.isDeepStrictEqual(yamlVersions, instVersions)) {
const opts = { colors: true }
const colors = x => util.inspect(x, opts)
pluginErrorMsg(pluginName, 'Mismatch', `
Expand Down
Loading