From 9740a613cf5265e9ed6a6b3f0b58ab8b03c7edce Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Fri, 16 Aug 2024 14:53:02 +0200 Subject: [PATCH] chore: revert changes --- .forgejo/workflows/build.yml | 5 ++--- ci/v7-test-values.yml | 2 +- ci/v8-test-values.yml | 2 +- ci/v9-test-values.yml | 2 +- renovate.json | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index cc45f1b..50a5a36 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -82,9 +82,8 @@ jobs: matrix: k3s: - v1.27.16+k3s1 # renovate: k3s - # only build oldes and newest version - # - v1.28.12+k3s1 # renovate: k3s - # - v1.29.7+k3s1 # renovate: k3s + - v1.28.12+k3s1 # renovate: k3s + - v1.29.7+k3s1 # renovate: k3s - v1.30.3+k3s1 # renovate: k3s steps: diff --git a/ci/v7-test-values.yml b/ci/v7-test-values.yml index a6886a9..a908c5a 100644 --- a/ci/v7-test-values.yml +++ b/ci/v7-test-values.yml @@ -1,7 +1,7 @@ image: registry: codeberg.org repository: forgejo-experimental/forgejo - tag: 7.0-test # https://code.forgejo.org/forgejo-helm/forgejo-helm/issues/771 @sha256:122db61afef4610ed79b4b8ec78ced3a79625480dbf0e2c8e444dd55755ffff0 + tag: 7.0-test@sha256:122db61afef4610ed79b4b8ec78ced3a79625480dbf0e2c8e444dd55755ffff0 redis-cluster: enabled: false diff --git a/ci/v8-test-values.yml b/ci/v8-test-values.yml index eecd98e..9bd5659 100644 --- a/ci/v8-test-values.yml +++ b/ci/v8-test-values.yml @@ -1,7 +1,7 @@ image: registry: codeberg.org repository: forgejo-experimental/forgejo - tag: 8.0-test # https://code.forgejo.org/forgejo-helm/forgejo-helm/issues/771 @sha256:1505556f1f43ead63a3d64907804cb301951af3cfbc00837ca264de05aaf30ee + tag: 8.0-test@sha256:1505556f1f43ead63a3d64907804cb301951af3cfbc00837ca264de05aaf30ee redis-cluster: enabled: false diff --git a/ci/v9-test-values.yml b/ci/v9-test-values.yml index dd7d08b..73eb57f 100644 --- a/ci/v9-test-values.yml +++ b/ci/v9-test-values.yml @@ -1,7 +1,7 @@ image: registry: codeberg.org repository: forgejo-experimental/forgejo - tag: 9.0-test # https://code.forgejo.org/forgejo-helm/forgejo-helm/issues/771 @sha256:2c44de40b83f5f65e5f7759a83f09226076fbbc26a2b4b33543721f2274c3083 + tag: 9.0-test@sha256:2c44de40b83f5f65e5f7759a83f09226076fbbc26a2b4b33543721f2274c3083 redis-cluster: enabled: false diff --git a/renovate.json b/renovate.json index 2ca9db2..ac609ad 100644 --- a/renovate.json +++ b/renovate.json @@ -76,7 +76,7 @@ }, { "description": "Require approval and no automerge for k3s major and minor updates", - "matchPackageNames": [ "k3s-io/k3s"], + "matchPackageNames": ["k3s-io/k3s"], "matchUpdateTypes": ["major", "minor"], "dependencyDashboardApproval": true, "automerge": false @@ -134,6 +134,6 @@ } ], "helm-values": { - "fileMatch": ["^ci/.+\\.yaml$"] + "fileMatch": ["^ci/.+\\.ya?ml$"] } }