diff --git a/.github/workflows/apm-integrations.yml b/.github/workflows/apm-integrations.yml index 6c215fe75ce..d21b3e8ba3d 100644 --- a/.github/workflows/apm-integrations.yml +++ b/.github/workflows/apm-integrations.yml @@ -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 @@ -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: diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml index 4c40ebff52b..ec65546f08c 100644 --- a/.github/workflows/appsec.yml +++ b/.github/workflows/appsec.yml @@ -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 @@ -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: diff --git a/packages/datadog-plugin-next/test/index.spec.js b/packages/datadog-plugin-next/test/index.spec.js index 32f2895f603..627cbc6e2e0 100644 --- a/packages/datadog-plugin-next/test/index.spec.js +++ b/packages/datadog-plugin-next/test/index.spec.js @@ -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) => { diff --git a/packages/datadog-plugin-next/test/integration-test/client.spec.js b/packages/datadog-plugin-next/test/integration-test/client.spec.js index 1265e91b1f5..76b114bc76c 100644 --- a/packages/datadog-plugin-next/test/integration-test/client.spec.js +++ b/packages/datadog-plugin-next/test/integration-test/client.spec.js @@ -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) diff --git a/packages/dd-trace/test/appsec/index.next.plugin.spec.js b/packages/dd-trace/test/appsec/index.next.plugin.spec.js index 4aaa0445336..8f7fbf2a9d8 100644 --- a/packages/dd-trace/test/appsec/index.next.plugin.spec.js +++ b/packages/dd-trace/test/appsec/index.next.plugin.spec.js @@ -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 diff --git a/scripts/verify-ci-config.js b/scripts/verify-ci-config.js index 06b11c93e70..7ea874e60c7 100644 --- a/scripts/verify-ci-config.js +++ b/scripts/verify-ci-config.js @@ -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', `