Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
2,982 workflow runs
2,982 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump Alpine to v3.21.0 Check for merge conflicts #2857: Pull request #5342 opened by twz123
December 11, 2024 09:05 11s
December 11, 2024 09:05 11s
[Backport release-1.31] Bump CoreDNS to v1.12.0 Check for merge conflicts #2856: Pull request #5341 opened by k0s-bot
December 11, 2024 08:57 15s
December 11, 2024 08:57 15s
Merge pull request #5316 from twz123/bump-coredns Check for merge conflicts #2855: Commit 21809d3 pushed by twz123
December 11, 2024 08:57 2m 15s main
main
December 11, 2024 08:57 2m 15s
Bump runc to v1.2.3 Check for merge conflicts #2854: Pull request #5340 opened by twz123
December 11, 2024 07:33 10s
December 11, 2024 07:33 10s
[Backport release-1.31] Bump containerd to v1.7.24 Check for merge conflicts #2853: Pull request #5339 opened by twz123
December 11, 2024 07:22 16s
December 11, 2024 07:22 16s
[Backport release-1.29] Add integration tests around k0s reset Check for merge conflicts #2852: Pull request #5338 opened by k0s-bot
December 11, 2024 07:17 13s
December 11, 2024 07:17 13s
[release-1.29] Bump Kubernetes to v1.29.11 Check for merge conflicts #2851: Pull request #5325 synchronize by twz123
December 11, 2024 07:12 10s
December 11, 2024 07:12 10s
[release-1.30] Bump Kubernetes to v1.30.7 Check for merge conflicts #2850: Pull request #5320 synchronize by twz123
December 11, 2024 07:11 14s
December 11, 2024 07:11 14s
Bump Kubernetes to v1.31.3 Check for merge conflicts #2849: Pull request #5318 synchronize by twz123
December 11, 2024 07:10 12s
December 11, 2024 07:10 12s
Merge pull request #5305 from twz123/kubelet-config-in-run-dir Check for merge conflicts #2848: Commit 3cdabc8 pushed by twz123
December 10, 2024 19:53 2m 10s main
main
December 10, 2024 19:53 2m 10s
Merge pull request #5194 from twz123/separate-cleanup-steps-data Check for merge conflicts #2847: Commit b798baa pushed by twz123
December 10, 2024 19:47 2m 18s main
main
December 10, 2024 19:47 2m 18s
Merge pull request #5329 from twz123/list-images-no-dyn-check Check for merge conflicts #2846: Commit 86789c3 pushed by twz123
December 10, 2024 19:39 2m 14s main
main
December 10, 2024 19:39 2m 14s
Merge pull request #5294 from twz123/remove-requests Check for merge conflicts #2845: Commit fa0ab80 pushed by twz123
December 10, 2024 19:37 2m 10s main
main
December 10, 2024 19:37 2m 10s
Merge pull request #5297 from twz123/docs-regenerate-ca Check for merge conflicts #2844: Commit 537f1bb pushed by twz123
December 10, 2024 19:33 2m 13s main
main
December 10, 2024 19:33 2m 13s
Merge pull request #5314 from twz123/bump-containerd Check for merge conflicts #2843: Commit b341fc1 pushed by twz123
December 10, 2024 19:30 2m 16s main
main
December 10, 2024 19:30 2m 16s
[Backport release-1.29] Bump Go to v1.22.10 Check for merge conflicts #2842: Pull request #5337 opened by k0s-bot
December 10, 2024 19:28 13s
December 10, 2024 19:28 13s
Merge pull request #5315 from twz123/backport-5241-to-release-1.29 Check for merge conflicts #2841: Commit 5c35f5d pushed by twz123
December 10, 2024 19:15 2m 12s release-1.29
release-1.29
December 10, 2024 19:15 2m 12s
Merge pull request #5335 from k0sproject/backport-5312-to-release-1.30 Check for merge conflicts #2840: Commit f02aad8 pushed by jnummelin
December 10, 2024 16:42 2m 12s release-1.30
release-1.30
December 10, 2024 16:42 2m 12s
Merge pull request #5303 from k0sproject/backport-5172-to-release-1.29 Check for merge conflicts #2839: Commit 4a29c7f pushed by jnummelin
December 10, 2024 10:49 2m 13s release-1.29
release-1.29
December 10, 2024 10:49 2m 13s
Merge pull request #5304 from twz123/fix-adopters-link Check for merge conflicts #2838: Commit 82c72ea pushed by twz123
December 10, 2024 10:48 2m 11s main
main
December 10, 2024 10:48 2m 11s
Merge pull request #5311 from twz123/bump-go Check for merge conflicts #2837: Commit f9ca929 pushed by twz123
December 10, 2024 10:45 2m 14s main
main
December 10, 2024 10:45 2m 14s
[Backport release-1.30] Bump Go to v1.22.10 Check for merge conflicts #2836: Pull request #5335 opened by k0s-bot
December 10, 2024 10:45 2m 21s
December 10, 2024 10:45 2m 21s
Merge pull request #5312 from twz123/bump-go-1.22 Check for merge conflicts #2835: Commit 2b4720c pushed by twz123
December 10, 2024 10:44 2m 15s release-1.31
release-1.31
December 10, 2024 10:44 2m 15s
Merge pull request #5331 from k0sproject/backport-4214-to-release-1.29 Check for merge conflicts #2834: Commit ee8705d pushed by jnummelin
December 10, 2024 10:39 2m 15s release-1.29
release-1.29
December 10, 2024 10:39 2m 15s
Verify blobs when downloading OCI artifacts Check for merge conflicts #2833: Pull request #5334 opened by twz123
December 9, 2024 15:07 12s
December 9, 2024 15:07 12s