From 865debe00b40fe02b6c13c7a7ee93e6af9738e55 Mon Sep 17 00:00:00 2001 From: Nafi Xhafa <164854562+nxhafa@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:38:18 +0100 Subject: [PATCH] chore: update renovate to ensure pipelines are passing (#3880) * 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 * chore: disable upgrade for springboot in v3.x.x branch Signed-off-by: nx673747 * chore: enable spring boot upgrade after integrating fix Signed-off-by: nx673747 --------- Signed-off-by: nx673747 Co-authored-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..bdef2c3753 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', '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