diff --git a/lib/manager/common.ts b/lib/manager/common.ts index 8bdb65973be0728ad573e3c2de58ffef9be0b298..9f87a6a62b435cba994e35a0b8e8dc447ce7da01 100644 --- a/lib/manager/common.ts +++ b/lib/manager/common.ts @@ -53,8 +53,8 @@ export interface PackageUpdateConfig { } export interface PackageUpdateResult { - newValue: string[]; - newMajor: string; + newValue: string; + newMajor: number; isRange: boolean; sourceUrl: string; } diff --git a/lib/manager/travis/__snapshots__/package.spec.ts.snap b/lib/manager/travis/__snapshots__/package.spec.ts.snap index cd4245bee954ec3a6f0084b27d1a9c897330c001..6d37099dc3292d92f87bac668f3bef042b34dcb0 100644 --- a/lib/manager/travis/__snapshots__/package.spec.ts.snap +++ b/lib/manager/travis/__snapshots__/package.spec.ts.snap @@ -5,10 +5,7 @@ Array [ Object { "isRange": true, "newMajor": 12, - "newValue": Array [ - "10.0.1", - "12.3.0", - ], + "newValue": "10.0.1,12.3.0", "sourceUrl": "https://github.com/nodejs/node", }, ] @@ -19,10 +16,7 @@ Array [ Object { "isRange": true, "newMajor": 12, - "newValue": Array [ - "10", - "12", - ], + "newValue": "10,12", "sourceUrl": "https://github.com/nodejs/node", }, ] diff --git a/lib/manager/travis/package.ts b/lib/manager/travis/package.ts index 5a59f18d7cf60278389e267e2d828804964e6342..28d31dc560f7f4fe63f987dc5a3a2505ad9e34fe 100644 --- a/lib/manager/travis/package.ts +++ b/lib/manager/travis/package.ts @@ -100,12 +100,11 @@ export async function getPackageUpdates( } } logger.debug({ supportPolicy }, `supportPolicy`); - // TODO: `newValue` is a (string | number)[] ! let newValue: any[] = (supportPolicy as (keyof NodeJsPolicies)[]) .map((policy) => policies[policy]) .reduce((result, policy) => result.concat(policy), []) .sort((a, b) => a - b); - const newMajor = newValue[newValue.length - 1]; + const newMajor: number = newValue[newValue.length - 1]; if (config.rangeStrategy === 'pin' || isVersion(config.currentValue[0])) { const versions = ( await getPkgReleases({ @@ -130,7 +129,7 @@ export async function getPackageUpdates( } return [ { - newValue, + newValue: newValue.join(','), newMajor, isRange: true, sourceUrl: 'https://github.com/nodejs/node', diff --git a/lib/manager/travis/update.spec.ts b/lib/manager/travis/update.spec.ts index fa8efab247bdcde72ca113b984e62a4a45904af2..8e91d243c822ed5734b92dac7daf90af9555c0d6 100644 --- a/lib/manager/travis/update.spec.ts +++ b/lib/manager/travis/update.spec.ts @@ -13,7 +13,7 @@ describe('manager/travis/update', () => { // TODO: should be `Upgrade` const upgrade: any = { currentValue: ['8', '6', '4'], - newValue: [6, 8], + newValue: '6,8', }; const res = updateDependency({ fileContent: content, upgrade }); expect(res).toMatchSnapshot(); @@ -22,7 +22,7 @@ describe('manager/travis/update', () => { // TODO: should be `Upgrade` const upgrade: any = { currentValue: [8, 6, 4], - newValue: [6, 8], + newValue: '6,8', }; const res = updateDependency({ fileContent: 'hello: world', @@ -34,7 +34,7 @@ describe('manager/travis/update', () => { // TODO: should be `Upgrade` const upgrade: any = { currentValue: ['6'], - newValue: [6, 8], + newValue: '6,8', }; const res = updateDependency({ fileContent: 'node_js:\n - "6"\n', @@ -46,7 +46,7 @@ describe('manager/travis/update', () => { // TODO: should be `Upgrade` const upgrade: any = { currentValue: [8, 6, 4], - newValue: '6', + newValue: 6, }; const res = updateDependency({ fileContent: content, upgrade }); expect(res).toBeNull(); diff --git a/lib/manager/travis/update.ts b/lib/manager/travis/update.ts index 089ad98ccc1f737a4c88e6f122ca96fd7bd5f13c..127ce8777dec96334cebb7e69876da3d8bb4790c 100644 --- a/lib/manager/travis/update.ts +++ b/lib/manager/travis/update.ts @@ -21,7 +21,7 @@ export function updateDependency({ } let newString = `node_js:\n`; // TODO: `newValue` is a string! - (upgrade.newValue as any).forEach((version) => { + upgrade.newValue.split(',').forEach((version) => { newString += `${indent}- ${quote}${version}${quote}\n`; }); return fileContent.replace(/node_js:(\n\s+-[^\n]+)+\n/, newString);