Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Let cleanup steps hold their own data Check for merge conflicts #2732: Pull request #5194 synchronize by twz123
November 19, 2024 08:38 12s
November 19, 2024 08:38 12s
Extract iptables binary staging to iptablesutils Check for merge conflicts #2731: Pull request #5095 synchronize by juanluisvaladas
November 18, 2024 20:24 12s
November 18, 2024 20:24 12s
Extract iptables binary staging to iptablesutils Check for merge conflicts #2730: Pull request #5095 synchronize by juanluisvaladas
November 18, 2024 20:21 2m 13s
November 18, 2024 20:21 2m 13s
Merge pull request #5269 from k0sproject/backport-5267-to-release-1.29 Check for merge conflicts #2729: Commit 748ad79 pushed by jnummelin
November 18, 2024 18:32 2m 10s release-1.29
release-1.29
November 18, 2024 18:32 2m 10s
Merge pull request #5263 from twz123/cgroup-setup-in-docker Check for merge conflicts #2728: Commit 5e5b1d9 pushed by twz123
November 18, 2024 16:07 2m 13s main
main
November 18, 2024 16:07 2m 13s
Enable nosprintfhostport linter Check for merge conflicts #2727: Pull request #5223 synchronize by twz123
November 18, 2024 16:06 14s
November 18, 2024 16:06 14s
build(deps): bump github.com/go-playground/validator/v10 from 10.22.1 to 10.23.0 Check for merge conflicts #2726: Pull request #5271 synchronize by dependabot bot
November 18, 2024 15:53 12s
November 18, 2024 15:53 12s
Merge pull request #5272 from twz123/fix-nolintlint Check for merge conflicts #2725: Commit 5d4c44c pushed by twz123
November 18, 2024 15:52 2m 11s main
main
November 18, 2024 15:52 2m 11s
Merge pull request #5268 from k0sproject/backport-5254-to-release-1.29 Check for merge conflicts #2724: Commit b74a061 pushed by twz123
November 18, 2024 15:11 2m 13s release-1.29
release-1.29
November 18, 2024 15:11 2m 13s
Extract iptables binary staging to iptablesutils Check for merge conflicts #2723: Pull request #5095 synchronize by juanluisvaladas
November 18, 2024 14:56 12s
November 18, 2024 14:56 12s
build(deps): bump mkdocs-include-markdown-plugin from 7.0.0 to 7.0.1 in /docs in the mkdocs group Check for merge conflicts #2722: Pull request #5273 opened by dependabot bot
November 18, 2024 13:55 14s
November 18, 2024 13:55 14s
Fix nolintlint Check for merge conflicts #2721: Pull request #5272 opened by twz123
November 18, 2024 13:35 14s
November 18, 2024 13:35 14s
build(deps): bump github.com/go-playground/validator/v10 from 10.22.1 to 10.23.0 Check for merge conflicts #2720: Pull request #5271 opened by dependabot bot
November 18, 2024 13:33 11s
November 18, 2024 13:33 11s
Merge pull request #5222 from twz123/nolintlint Check for merge conflicts #2719: Commit 89fb17e pushed by twz123
November 18, 2024 13:20 2m 11s main
main
November 18, 2024 13:20 2m 11s
[Backport release-1.31] Correctly detect DNS address computation errors Check for merge conflicts #2718: Pull request #5270 opened by k0s-bot
November 18, 2024 13:16 2m 16s
November 18, 2024 13:16 2m 16s
Merge pull request #5236 from twz123/dns-address-computation-errors Check for merge conflicts #2717: Commit fa503dd pushed by twz123
November 18, 2024 13:16 2m 13s main
main
November 18, 2024 13:16 2m 13s
Merge pull request #5237 from k0sproject/dependabot/go_modules/hack/t… Check for merge conflicts #2716: Commit ca56c2a pushed by twz123
November 18, 2024 13:15 2m 16s main
main
November 18, 2024 13:15 2m 16s
Extract iptables binary staging to iptablesutils Check for merge conflicts #2715: Pull request #5095 synchronize by juanluisvaladas
November 18, 2024 13:12 16s
November 18, 2024 13:12 16s
[Backport release-1.29] Bump CoreDNS to v1.11.4 Check for merge conflicts #2714: Pull request #5269 opened by k0s-bot
November 18, 2024 12:25 14s
November 18, 2024 12:25 14s
Merge pull request #5267 from k0sproject/backport-5255-to-release-1.30 Check for merge conflicts #2713: Commit 05d77a0 pushed by jnummelin
November 18, 2024 12:25 2m 15s release-1.30
release-1.30
November 18, 2024 12:25 2m 15s
Merge pull request #5266 from k0sproject/backport-5256-to-release-1.29 Check for merge conflicts #2712: Commit 9eb42b1 pushed by jnummelin
November 18, 2024 12:23 2m 14s release-1.29
release-1.29
November 18, 2024 12:23 2m 14s
Merge pull request #5171 from k0sproject/backport-5062-to-release-1.31 Check for merge conflicts #2711: Commit 88f3930 pushed by twz123
November 18, 2024 10:25 13s release-1.31
release-1.31
November 18, 2024 10:25 13s
Merge pull request #5185 from twz123/no-cplb-on-darwin Check for merge conflicts #2710: Commit f7f153f pushed by twz123
November 18, 2024 10:24 2m 17s main
main
November 18, 2024 10:24 2m 17s
[Backport release-1.29] Run libseccomp tests in parallel Check for merge conflicts #2709: Pull request #5268 opened by k0s-bot
November 18, 2024 10:21 10s
November 18, 2024 10:21 10s
Merge pull request #5254 from k0sproject/backport-5252-to-release-1.30 Check for merge conflicts #2708: Commit 6d163d0 pushed by jnummelin
November 18, 2024 10:21 2m 14s release-1.30
release-1.30
November 18, 2024 10:21 2m 14s