Merge branch 'main' into main

This commit is contained in:
Stefan Bethke 2024-09-12 11:18:07 +00:00
commit 667d0c0762
9 changed files with 26 additions and 81 deletions

View file

@ -13,10 +13,10 @@ permissions:
contents: read
env:
HELM_VERSION: v3.15.4 # renovate: datasource=github-releases depName=helm packageName=helm/helm
HELM_VERSION: v3.16.0 # renovate: datasource=github-releases depName=helm packageName=helm/helm
HELM_UNITTEST_VERSION: v0.6.1 # renovate: datasource=github-releases depName=helm-unittest packageName=helm-unittest/helm-unittest
HELM_CHART_TESTING_VERSION: v3.11.0 # renovate: datasource=github-releases depName=chart-testing packageName=helm/chart-testing
KUBECTL_VERSION: v1.31.0 # renovate: datasource=github-releases depName=kubectl packageName=kubernetes/kubernetes
KUBECTL_VERSION: v1.31.1 # renovate: datasource=github-releases depName=kubectl packageName=kubernetes/kubernetes
CT_GITHUB_GROUPS: true
jobs:
@ -82,10 +82,14 @@ jobs:
strategy:
matrix:
k3s:
- v1.27.16+k3s1 # renovate: k3s
# https://github.com/k3s-io/k3s/branches
# oldest supported version
- v1.28.13+k3s1 # renovate: k3s
- v1.29.8+k3s1 # renovate: k3s
# https://github.com/k3s-io/k3s/blob/master/channel.yaml#L3-L4
# stable version
- v1.30.4+k3s1 # renovate: k3s
# newest version
- v1.31.0+k3s1 # renovate: k3s
steps:
- run: cat /etc/os-release

View file

@ -4,12 +4,12 @@ dependencies:
version: 15.5.29
- name: postgresql-ha
repository: oci://registry-1.docker.io/bitnamicharts
version: 14.2.26
version: 14.2.27
- name: redis-cluster
repository: oci://registry-1.docker.io/bitnamicharts
version: 11.0.3
- name: redis
repository: oci://registry-1.docker.io/bitnamicharts
version: 20.1.0
digest: sha256:e3ae7447ac05b52920a59d40cd8a024aa1e076abb8d728b354805d85bd6d0364
generated: "2024-09-11T00:02:11.404670809Z"
digest: sha256:00ab3685216e8998a00aaa046b0f70a5f87bee9f9187e21a3f1c8d75d4e8615a
generated: "2024-09-12T00:00:34.21890473Z"

View file

@ -34,7 +34,7 @@ dependencies:
# https://github.com/bitnami/charts/blob/main/bitnami/postgresql-ha/Chart.yaml
- name: postgresql-ha
repository: oci://registry-1.docker.io/bitnamicharts
version: 14.2.26
version: 14.2.27
condition: postgresql-ha.enabled
# https://github.com/bitnami/charts/blob/main/bitnami/redis-cluster/Chart.yaml
- name: redis-cluster

View file

@ -18,7 +18,7 @@
"clipanion": "3.2.1",
"conventional-changelog-conventionalcommits": "8.0.0",
"conventional-changelog-core": "8.0.0",
"husky": "9.1.5",
"husky": "9.1.6",
"lint-staged": "15.2.10",
"markdownlint-cli": "0.41.0",
"prettier": "3.3.3"

View file

@ -21,8 +21,8 @@ importers:
specifier: 8.0.0
version: 8.0.0(conventional-commits-filter@4.0.0)
husky:
specifier: 9.1.5
version: 9.1.5
specifier: 9.1.6
version: 9.1.6
lint-staged:
specifier: 15.2.10
version: 15.2.10
@ -334,8 +334,8 @@ packages:
resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
engines: {node: '>=16.17.0'}
husky@9.1.5:
resolution: {integrity: sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==}
husky@9.1.6:
resolution: {integrity: sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==}
engines: {node: '>=18'}
hasBin: true
@ -1018,7 +1018,7 @@ snapshots:
human-signals@5.0.0: {}
husky@9.1.5: {}
husky@9.1.6: {}
ignore@5.3.1: {}

View file

@ -39,13 +39,13 @@
"semanticCommitType": "feat"
},
{
"description": "Automerge and group helm subchart updates daily (minor & patch)",
"description": "Automerge and group helm subchart updates weekly (minor & patch)",
"matchManagers": ["helmv3"],
"matchFileNames": ["Chart.yaml"],
"matchUpdateTypes": ["minor", "patch"],
"automerge": true,
"groupName": "subcharts",
"extends": ["schedule:daily"]
"extends": ["schedule:weekly"]
},
{
"description": "Automerge dev deps updates",

View file

@ -1,67 +1,8 @@
import conventionalChangelogCore from 'conventional-changelog-core';
import conventionalChangelogPreset from 'conventional-changelog-conventionalcommits';
import { getChangelog } from './changelog/util.js';
import fs from 'node:fs';
const config = conventionalChangelogPreset({
types: [
{
type: 'feat',
section: 'Features',
},
{
type: 'fix',
section: 'Bug Fixes',
},
{
type: 'perf',
section: 'Performance Improvements',
},
{
type: 'revert',
section: 'Reverts',
},
{
type: 'docs',
section: 'Documentation',
},
{
type: 'style',
section: 'Styles',
},
{
type: 'refactor',
section: 'Code Refactoring',
},
{
type: 'test',
section: 'Tests',
},
{
type: 'build',
section: 'Build System',
},
{
type: 'ci',
section: 'Continuous Integration',
},
{
type: 'chore',
section: 'Miscellaneous Chores',
},
],
});
const file = process.argv[3]
? fs.createWriteStream(process.argv[3])
: process.stdout;
conventionalChangelogCore(
{
config,
releaseCount: 2,
},
{ version: process.argv[2], linkCompare: false },
undefined,
undefined,
{ headerPartial: '' },
).pipe(file);
getChangelog().pipe(file);

View file

@ -56,11 +56,11 @@ export const config = conventionalChangelogPreset({
/**
*
* @param {string} version
* @param {boolean} onTag
* @param {string|undefined} version
* @param {boolean|undefined} onTag
* @returns
*/
export function getChangelog(version, onTag) {
export function getChangelog(version = undefined, onTag = false) {
return conventionalChangelogCore(
{
config,

View file

@ -68,7 +68,7 @@ class GiteaReleaseCommand extends Command {
return 1;
}
const stream = getChangelog(tag, true).setEncoding('utf8');
const stream = getChangelog(undefined, false).setEncoding('utf8');
const changes = (await stream.toArray()).join('');
this.context.stdout.write(`Creating release ${tag}.\n`);