Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
510 workflow run results
510 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump Go to v1.22.1 Check for merge conflicts #460: Pull request #4170 opened by twz123
March 14, 2024 11:09 40s
March 14, 2024 11:09 40s
Dual-stack with Kube router 2 Check for merge conflicts #459: Pull request #3954 synchronize by ncopa
March 14, 2024 09:41 15s
March 14, 2024 09:41 15s
Merge pull request #4143 from k0sproject/dependabot/github_actions/sh… Check for merge conflicts #458: Commit e636f2e pushed by twz123
March 14, 2024 09:39 2m 15s main
main
March 14, 2024 09:39 2m 15s
Bump envoy to v1.29.2 Check for merge conflicts #457: Pull request #4156 synchronize by twz123
March 14, 2024 09:36 13s
March 14, 2024 09:36 13s
[Backport release-1.29] Bump containerd 1.7.14 Check for merge conflicts #456: Pull request #4169 opened by twz123
March 14, 2024 09:27 14s
March 14, 2024 09:27 14s
Bump github.com/cloudflare/cfssl from 1.6.4 to 1.6.5 Check for merge conflicts #455: Pull request #4158 synchronize by dependabot bot
March 14, 2024 09:25 11s
March 14, 2024 09:25 11s
Bump golang.org/x/sys from 0.17.0 to 0.18.0 Check for merge conflicts #454: Pull request #4141 synchronize by dependabot bot
March 14, 2024 09:24 17s
March 14, 2024 09:24 17s
Merge pull request #4155 from ncopa/containerd-1.7.14 Check for merge conflicts #453: Commit 4b7c2cc pushed by ncopa
March 14, 2024 09:23 2m 12s main
main
March 14, 2024 09:23 2m 12s
[Backport release 1.29] Fix CVE-2024-24786 Check for merge conflicts #452: Pull request #4168 opened by twz123
March 14, 2024 09:19 2m 12s
March 14, 2024 09:19 2m 12s
Bump kine to v0.11.6 Check for merge conflicts #451: Pull request #4167 opened by twz123
March 14, 2024 09:01 11s
March 14, 2024 09:01 11s
[Backport release-1.29] Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /hack/tool Check for merge conflicts #450: Pull request #4166 opened by k0s-bot
March 14, 2024 08:57 43s
March 14, 2024 08:57 43s
Merge pull request #4159 from k0sproject/backport-4145-to-release-1.29 Check for merge conflicts #449: Commit 7334adc pushed by twz123
March 14, 2024 08:18 2m 20s release-1.29
release-1.29
March 14, 2024 08:18 2m 20s
remove --enable-hostpath-provisioner flag from kube-controller-manager Check for merge conflicts #448: Pull request #4165 synchronize by carlory
March 14, 2024 08:00 10s
March 14, 2024 08:00 10s
remove --enable-hostpath-provisioner flag from kube-controller-manager Check for merge conflicts #447: Pull request #4165 opened by carlory
March 14, 2024 07:59 10s
March 14, 2024 07:59 10s
Bump google.golang.org/protobuf from 1.32.0 to 1.33.0 Check for merge conflicts #446: Pull request #4164 opened by dependabot bot
March 13, 2024 23:38 13s
March 13, 2024 23:38 13s
Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /hack/tool Check for merge conflicts #445: Pull request #4163 opened by dependabot bot
March 13, 2024 23:12 23s
March 13, 2024 23:12 23s
Pass along containerd config as return value Check for merge conflicts #444: Pull request #4160 opened by twz123
March 13, 2024 14:44 1m 8s
March 13, 2024 14:44 1m 8s
[Backport release-1.29] Bump kine to 0.11.5 Check for merge conflicts #443: Pull request #4159 opened by k0s-bot
March 13, 2024 11:44 23s
March 13, 2024 11:44 23s
Merge pull request #4145 from ncopa/kine-0.11.5 Check for merge conflicts #442: Commit abe4e8f pushed by ncopa
March 13, 2024 11:43 2m 18s main
main
March 13, 2024 11:43 2m 18s
Bump containerd 1.7.14 Check for merge conflicts #441: Pull request #4155 synchronize by ncopa
March 13, 2024 11:43 30s
March 13, 2024 11:43 30s
Wrap errors correctly Check for merge conflicts #440: Pull request #4029 synchronize by twz123
March 13, 2024 07:23 2m 12s
March 13, 2024 07:23 2m 12s
Bump github.com/cloudflare/cfssl from 1.6.4 to 1.6.5 Check for merge conflicts #439: Pull request #4158 opened by dependabot bot
March 12, 2024 13:59 16s
March 12, 2024 13:59 16s
Bump wheel from 0.42.0 to 0.43.0 in /docs Check for merge conflicts #438: Pull request #4157 opened by dependabot bot
March 12, 2024 13:53 13s
March 12, 2024 13:53 13s
Merge pull request #4042 from twz123/unix-build-tag Check for merge conflicts #437: Commit b646e9f pushed by twz123
March 12, 2024 12:56 2m 22s main
main
March 12, 2024 12:56 2m 22s
Improve k0s-managed containerd config detection Check for merge conflicts #436: Pull request #4117 synchronize by twz123
March 12, 2024 12:32 14s
March 12, 2024 12:32 14s