From 1ca9efda291dd0b6bb1b40d65a0f6653b20e9c36 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 May 2021 13:26:49 +0200
Subject: [PATCH] Fix some CI issues

---
 .github/renovate.json5                | 33 +++++++++++++++------------
 .github/workflows/renovate-bump.yaml  |  4 ++--
 charts/incubator/grocy/Chart.yaml     |  2 +-
 charts/stable/lidarr/Chart.yaml       |  2 +-
 charts/stable/plex/Chart.yaml         |  2 +-
 charts/stable/zwavejs2mqtt/Chart.yaml |  2 +-
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 3857f0ec7fd..4274fe743f3 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -52,6 +52,7 @@
     },
     {
       "matchDatasources": ["helm"],
+      "automerge": true,
       "updateTypes": ["patch"],
       "bumpVersion": "patch",
       "labels": ["dependency/patch"],
@@ -70,7 +71,7 @@
       "labels": ["dependency/major"],
       "excludePackageNames": ["common"],
       "schedule": [
-        "on monday"
+        "on tuesday"
       ]
     },
     {
@@ -81,7 +82,7 @@
       "excludePackageNames": ["common"],
       "groupName": ["external minor dep"],
       "schedule": [
-        "on monday"
+        "on tuesday"
       ]
     },
     {
@@ -91,6 +92,9 @@
       "labels": ["dependency/patch"],
       "excludePackageNames": ["common"],
       "groupName": ["external patch dep"],
+      "schedule": [
+        "on tuesday"
+      ]
     },
     //
     // Tag updates for semantic tags
@@ -101,21 +105,30 @@
       "branchTopic": "{{{parentDir}}}-{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
       "updateTypes": ["major"],
       "bumpVersion": "major",
-      "labels": ["tag/major"]
+      "labels": ["tag/major"],
+      "schedule": [
+        "on tuesday"
+      ]
     },
     {
       "matchDatasources": ["docker"],
       "updateTypes": ["minor"],
       "bumpVersion": "minor",
       "labels": ["tag/minor"],
-      "groupName": ["minor"]
+      "groupName": ["minor"],
+      "schedule": [
+        "on tuesday"
+      ]
     },
     {
       "matchDatasources": ["docker"],
       "updateTypes": ["patch"],
       "bumpVersion": "patch",
       "labels": ["tag/patch"],
-      "groupName": ["patch"]
+      "groupName": ["patch"],
+      "schedule": [
+        "on tuesday"
+      ]
     },
     //
     // Version strategies
@@ -134,15 +147,5 @@
         "ghcr.io/truecharts/qbittorrent",
       ],
     },
-    // enable container auto-merge
-    {
-      "matchDatasources": ["docker"],
-      "automerge": true,
-      "matchUpdateTypes": ["minor", "patch"],
-      "matchPackageNames": [
-        "ghcr.io/truecharts/plex",
-        "ghcr.io/truecharts/jackett",
-     ],
-    },
   ]
 }
diff --git a/.github/workflows/renovate-bump.yaml b/.github/workflows/renovate-bump.yaml
index 5d1f9634eb9..bd2926c9b69 100644
--- a/.github/workflows/renovate-bump.yaml
+++ b/.github/workflows/renovate-bump.yaml
@@ -87,5 +87,5 @@ jobs:
           git config user.name "TrueCharts-Bot"
           git config user.email "bot@truecharts.org"
           git add --all
-          git commit --amend || exit 0
-          git push --force
+          git commit -sm "Commit bumped App Version" || exit 0
+          git push
diff --git a/charts/incubator/grocy/Chart.yaml b/charts/incubator/grocy/Chart.yaml
index f23e93da554..f4f717ee2e6 100644
--- a/charts/incubator/grocy/Chart.yaml
+++ b/charts/incubator/grocy/Chart.yaml
@@ -23,4 +23,4 @@ sources:
 - https://github.com/grocy/grocy
 type: application
 upstream_version: 4.3.1
-version: 4.0.2
+version: 4.0.3
diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml
index e05eca59816..6e0829c42d3 100644
--- a/charts/stable/lidarr/Chart.yaml
+++ b/charts/stable/lidarr/Chart.yaml
@@ -28,4 +28,4 @@ sources:
 - https://hub.docker.com/r/linuxserver/lidarr
 type: application
 upstream_version: 7.1.0
-version: 4.0.2
+version: 4.0.3
diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml
index 9536d3608c6..6e23aa32db0 100644
--- a/charts/stable/plex/Chart.yaml
+++ b/charts/stable/plex/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: plex
-version: 3.0.2
+version: 3.0.3
 upstream_version: 4.2.1
 appVersion: "auto"
 description: Plex Media Server
diff --git a/charts/stable/zwavejs2mqtt/Chart.yaml b/charts/stable/zwavejs2mqtt/Chart.yaml
index 227b9ab98e3..396576404e6 100644
--- a/charts/stable/zwavejs2mqtt/Chart.yaml
+++ b/charts/stable/zwavejs2mqtt/Chart.yaml
@@ -30,4 +30,4 @@ sources:
 - https://hub.docker.com/r/zwavejs/zwavejs2mqtt
 type: application
 upstream_version: 1.1.0
-version: 4.0.2
+version: 4.0.3