From 523c4665a593999be6a10fd0314b15e642d4ab0b Mon Sep 17 00:00:00 2001 From: nx673747 Date: Fri, 1 Nov 2024 18:12:36 +0100 Subject: [PATCH 1/3] chore: updating renovate config: 1- ensure renovate commit has signoff option 2- work around the npm install bug to ensure package-lock files are updated correctly Signed-off-by: nx673747 --- .github/workflows/renovate-bot.yml | 1 + renovate-config.js | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/renovate-bot.yml b/.github/workflows/renovate-bot.yml index 21035d348e..58d4e1db1c 100644 --- a/.github/workflows/renovate-bot.yml +++ b/.github/workflows/renovate-bot.yml @@ -22,6 +22,7 @@ jobs: # RENOVATE_TOKEN should have access :read_user, api, write_repository (repo checkbox) RENOVATE_TOKEN: ${{ secrets.ROBOT_PAT }} RENOVATE_CONFIG_FILE: ${{ github.workspace }}/renovate-config.js + RENOVATE_GIT_AUTHOR: "Renovate Bot " LOG_LEVEL: error run: | renovate diff --git a/renovate-config.js b/renovate-config.js index 7d795b61ce..83d0e8ee38 100644 --- a/renovate-config.js +++ b/renovate-config.js @@ -1,8 +1,10 @@ module.exports = { globalExtends: ["config:recommended"], // using this instead of "extends" solves the problem with order of the configuration repositories: ['zowe/api-layer'], - baseBranches: ["v2.x.x","v3.x.x"], + baseBranches: ["v2.x.x", "v3.x.x"], + commitBody: "Signed-off-by: {{{gitAuthor}}}", dependencyDashboard: true, + allowedPostUpgradeCommands: ['^npm install'], packageRules: [ { //for v2.x.x branch ignore grouping from extends preset, find all packages which are patches, @@ -12,6 +14,11 @@ module.exports = { "groupSlug": "all-patch", "matchPackageNames": ["*"], "matchUpdateTypes": ["patch"], + "postUpgradeTasks": { + "commands": ["npm install --package-lock-only"], + "fileFilters": ["**/**"], + "executionMode": "branch" + } }, { //for v2.x.x make dashboard approval to all major and minor dependencies updates @@ -26,7 +33,12 @@ module.exports = { "groupName": "all non-major dependencies", "groupSlug": "all-minor-patch", "matchPackageNames": ["*"], - "matchUpdateTypes": ["minor", "patch"] + "matchUpdateTypes": ["minor", "patch"], + "postUpgradeTasks": { + "commands": ["npm install --package-lock-only"], + "fileFilters": ["**/**"], + "executionMode": "branch" + } }, { //for v3.x.x make dashboard approval to all major dependencies updates @@ -38,7 +50,7 @@ module.exports = { printConfig: true, labels: ['dependencies'], dependencyDashboardLabels: ['dependencies'], - ignoreDeps: ['history','jsdom','react-router-dom','@mui/icons-material','@mui/material','@material-ui/core','@material-ui/icons'], + ignoreDeps: ['history', 'jsdom', 'react-router-dom', '@mui/icons-material', '@mui/material', '@material-ui/core', '@material-ui/icons'], commitMessagePrefix: 'chore: ', prHourlyLimit: 0, // removes rate limit for PR creation per hour npmrc: 'legacy-peer-deps=true\nregistry=https://zowe.jfrog.io/artifactory/api/npm/npm-org/', //for updating lock-files From 96a06d8eba3b42befea8db577dc990d8709f4706 Mon Sep 17 00:00:00 2001 From: nx673747 Date: Tue, 5 Nov 2024 19:54:34 +0100 Subject: [PATCH 2/3] chore: disable upgrade for springboot in v3.x.x branch Signed-off-by: nx673747 --- renovate-config.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/renovate-config.js b/renovate-config.js index 83d0e8ee38..51767b0aa5 100644 --- a/renovate-config.js +++ b/renovate-config.js @@ -26,6 +26,12 @@ module.exports = { "matchUpdateTypes": ["major", "minor"], "dependencyDashboardApproval": true, }, + // Disable the upgrade of springboot in v3.x.x + { + "matchBaseBranches": ["v3.x.x"], + "matchPackageNames": ["org.springframework.boot:**"], + "enabled": false + }, { //for v3.x.x branch find all packages which are minor and patches, // slug them and make PR with name "all non-major dependencies" @@ -50,7 +56,7 @@ module.exports = { printConfig: true, labels: ['dependencies'], dependencyDashboardLabels: ['dependencies'], - ignoreDeps: ['history', 'jsdom', 'react-router-dom', '@mui/icons-material', '@mui/material', '@material-ui/core', '@material-ui/icons'], + ignoreDeps: ['history', 'jsdom', 'react-router-dom', '@mui/icons-material', '@mui/material', '@material-ui/core', '@material-ui/icons', 'undici'], commitMessagePrefix: 'chore: ', prHourlyLimit: 0, // removes rate limit for PR creation per hour npmrc: 'legacy-peer-deps=true\nregistry=https://zowe.jfrog.io/artifactory/api/npm/npm-org/', //for updating lock-files From e5121d090e6138cfa8d91e3c4ffa9d1a0eb10889 Mon Sep 17 00:00:00 2001 From: nx673747 Date: Wed, 6 Nov 2024 16:54:01 +0100 Subject: [PATCH 3/3] chore: enable spring boot upgrade after integrating fix Signed-off-by: nx673747 --- renovate-config.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/renovate-config.js b/renovate-config.js index 51767b0aa5..bdef2c3753 100644 --- a/renovate-config.js +++ b/renovate-config.js @@ -26,12 +26,6 @@ module.exports = { "matchUpdateTypes": ["major", "minor"], "dependencyDashboardApproval": true, }, - // Disable the upgrade of springboot in v3.x.x - { - "matchBaseBranches": ["v3.x.x"], - "matchPackageNames": ["org.springframework.boot:**"], - "enabled": false - }, { //for v3.x.x branch find all packages which are minor and patches, // slug them and make PR with name "all non-major dependencies"