From 1e57f14f623a48544428d6618843b83280a52b79 Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:29:46 +0200 Subject: [PATCH 01/10] Update renovate.json --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 5db72dd6a..4b6245c5c 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,6 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended" - ] + ], + "prHourlyLimit": 3 } From 235e9c3563e084127b687ffc2ee8daab8369c9da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:31:39 +0000 Subject: [PATCH 02/10] Update dependency lodash to v4.17.21 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89ac9370c..fe23d6488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@date-io/date-fns": "2.10.0", "@date-io/moment": "2.10.0", "commander": "2.20.3", - "lodash": "4.17.20" + "lodash": "4.17.21" } }, "node_modules/@date-io/core": { @@ -61,9 +61,9 @@ } }, "node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/moment": { "version": "2.29.4", @@ -109,9 +109,9 @@ "peer": true }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "moment": { "version": "2.29.4", diff --git a/package.json b/package.json index d53a58a40..18146d15d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "dependencies": { "commander": "2.20.3", - "lodash": "4.17.20", + "lodash": "4.17.21", "@date-io/date-fns": "2.10.0", "@date-io/moment": "2.10.0" } From 7ff6e8497f95024b349aeb0e1fa306e6032d9910 Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:41:53 +0200 Subject: [PATCH 03/10] Update renovate.json --- renovate.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 4b6245c5c..3db70c965 100644 --- a/renovate.json +++ b/renovate.json @@ -3,5 +3,11 @@ "extends": [ "config:recommended" ], - "prHourlyLimit": 3 + "prHourlyLimit": 3, + "packageRules": [ + { + "matchUpdateTypes": ["major"], + "dependencyDashboardApproval": true + } + ] } From 3a0145261f7a93e03ecc5dac04828af85ffc0a05 Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:53:16 +0200 Subject: [PATCH 04/10] Update renovate.json --- renovate.json | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/renovate.json b/renovate.json index 3db70c965..08b80fda0 100644 --- a/renovate.json +++ b/renovate.json @@ -1,13 +1,40 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:recommended" - ], - "prHourlyLimit": 3, + "config:recommended", + "mergeConfidence:all-badges", + ":gitSignOff", + ":automergeRequireAllStatusChecks" + ], + "labels": ["whitesource"], + "transitiveRemediation": true, + "branchNameStrict": true, "packageRules": [ + { + "enabled": false, + "matchPackagePatterns": ["*"] + }, { "matchUpdateTypes": ["major"], - "dependencyDashboardApproval": true - } - ] + "addLabels": ["major"] + }, + { + "matchUpdateTypes": ["minor"], + "addLabels": ["minor"] + }, + { + "matchUpdateTypes": ["patch"], + "addLabels": ["patch"] + }, + { + "matchUpdateTypes": ["patch"], + "matchConfidence": ["very high", "high"], + "addLabels": ["auto merge test"] + } + ], + "vulnerabilityAlerts": { + "enabled": true + }, + "osvVulnerabilityAlerts": true, + "branchPrefix": "whitesource-remediate-" } From 25f37ad5e9fc81ccf345c1f0aa668d9ca2934040 Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:01:43 +0200 Subject: [PATCH 05/10] Update renovate.json --- renovate.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/renovate.json b/renovate.json index 08b80fda0..bc2888de7 100644 --- a/renovate.json +++ b/renovate.json @@ -24,13 +24,10 @@ }, { "matchUpdateTypes": ["patch"], - "addLabels": ["patch"] - }, - { - "matchUpdateTypes": ["patch"], - "matchConfidence": ["very high", "high"], - "addLabels": ["auto merge test"] - } + "addLabels": ["patch", "auto-merged"], + "automerge": true, + "automergeType": "pr" + } ], "vulnerabilityAlerts": { "enabled": true From a7d430e58a76f6413160b3c6a22135f92934d271 Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:07:29 +0200 Subject: [PATCH 06/10] Update renovate.json --- renovate.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/renovate.json b/renovate.json index bc2888de7..f68996d1c 100644 --- a/renovate.json +++ b/renovate.json @@ -1,11 +1,11 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:recommended", - "mergeConfidence:all-badges", - ":gitSignOff", - ":automergeRequireAllStatusChecks" - ], + "config:recommended", + "mergeConfidence:all-badges", + ":gitSignOff", + ":automergeRequireAllStatusChecks" + ], "labels": ["whitesource"], "transitiveRemediation": true, "branchNameStrict": true, From fb50d3d38b35964feff0c0d2864d5f460af222e9 Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:14:31 +0200 Subject: [PATCH 07/10] Update renovate.json --- renovate.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/renovate.json b/renovate.json index f68996d1c..3e3e30de1 100644 --- a/renovate.json +++ b/renovate.json @@ -10,10 +10,6 @@ "transitiveRemediation": true, "branchNameStrict": true, "packageRules": [ - { - "enabled": false, - "matchPackagePatterns": ["*"] - }, { "matchUpdateTypes": ["major"], "addLabels": ["major"] From cf50497823e1d8a7d0f1139d1a26bcb5fc281e7d Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Fri, 7 Jun 2024 08:20:11 +0200 Subject: [PATCH 08/10] Update renovate.json --- renovate.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index 3e3e30de1..e7fdbc48b 100644 --- a/renovate.json +++ b/renovate.json @@ -6,7 +6,7 @@ ":gitSignOff", ":automergeRequireAllStatusChecks" ], - "labels": ["whitesource"], + "labels": ["dependecy update"], "transitiveRemediation": true, "branchNameStrict": true, "packageRules": [ @@ -20,9 +20,15 @@ }, { "matchUpdateTypes": ["patch"], - "addLabels": ["patch", "auto-merged"], + "addLabels": ["patch"] + }, + { + "matchUpdateTypes": ["patch", "minor"], + "addLabels": ["auto-merged"], "automerge": true, - "automergeType": "pr" + "automergeType": "pr", + "automergeStrategy": "squash", + "autoApprove": true } ], "vulnerabilityAlerts": { From 9aa160317ccbd87a6606ef812846e861e48a3b0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 06:20:54 +0000 Subject: [PATCH 09/10] Update php Docker tag to v8.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d70fe37f..dcf22467e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM php:8.0-fpm +FROM php:8.3-fpm ENV DOCKERIZE_VERSION 0.6.1 From 7987397c35e61508bff1b7a8f94fe74d4a97158d Mon Sep 17 00:00:00 2001 From: Jan-Olszowka <111862576+Jan-Olszowka@users.noreply.github.com> Date: Fri, 7 Jun 2024 08:35:02 +0200 Subject: [PATCH 10/10] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 67045665d..177b73872 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* lerna-debug.log* +test* # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json