Merge branch 'main' into main

This commit is contained in:
Stefan Bethke 2024-09-11 12:20:35 +00:00
commit 99678b121e
4 changed files with 18 additions and 7 deletions

View file

@ -5,11 +5,15 @@ description: 'setup node'
runs: runs:
using: 'composite' using: 'composite'
steps: steps:
- name: Setup pnpm
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
with:
standalone: true
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
with: with:
node-version-file: .node-version node-version-file: .node-version
# cache: 'npm' cache: 'pnpm'
- shell: bash
run: corepack enable
- shell: bash - shell: bash
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile

View file

@ -83,9 +83,9 @@ jobs:
matrix: matrix:
k3s: k3s:
- v1.27.16+k3s1 # renovate: k3s - v1.27.16+k3s1 # renovate: k3s
- v1.28.12+k3s1 # renovate: k3s - v1.28.13+k3s1 # renovate: k3s
- v1.29.7+k3s1 # renovate: k3s - v1.29.8+k3s1 # renovate: k3s
- v1.30.3+k3s1 # renovate: k3s - v1.30.4+k3s1 # renovate: k3s
steps: steps:
- run: cat /etc/os-release - run: cat /etc/os-release

View file

@ -25,7 +25,7 @@
}, },
"packageManager": "pnpm@9.10.0", "packageManager": "pnpm@9.10.0",
"engines": { "engines": {
"node": "^18.12.0 || >=20.9.0", "node": "^20.9.0",
"pnpm": "^9.0.0" "pnpm": "^9.0.0"
} }
} }

View file

@ -87,6 +87,13 @@
"matchUpdateTypes": ["major", "minor"], "matchUpdateTypes": ["major", "minor"],
"automerge": false "automerge": false
}, },
{
"description": "Group k3s patch updates",
"matchDatasources": ["github-releases"],
"matchPackageNames": ["k3s-io/k3s"],
"matchUpdateTypes": ["patch"],
"groupName": "k3s"
},
{ {
"description": "Use test scope for forgejo ci tests", "description": "Use test scope for forgejo ci tests",
"matchFileNames": ["ci/*.yaml"], "matchFileNames": ["ci/*.yaml"],