BlueGit

timfa bluegit

Merge branch 'cursor/runner-fixes' into 'stage'

timfa

Authored 2026-10-24 · 3 weeks ago

Hash
1bd834f5ba4b1ea35a498d26cf991ce964a61baf
Pipeline
Passed
6 files changed +169 −3
internal/ci/eval.go +7 −2
@@ -116,6 +116,9 @@ func (p Pipeline) Select(ev Eval) ([]Job, error) {
116 116 if ev.Env == nil {
117 117 ev.Env = map[string]string{}
118 118 }
119 if len(p.Workflow) > 0 && ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event" {
120 ev.workflowMR, _ = p.Allow(ev)
121 }
119 122 var out []Job
120 123 active := map[string]bool{}
121 124 var pending []Job
@@ -260,8 +263,10 @@ func onlyExcept(j Job, ev Eval) (bool, error) {
260 263 mr := ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event"
261 264 if len(j.Only) == 0 && len(j.Except) == 0 {
262 265 // Zonder rules of only draait een job op een branch of tag,
263 // niet in een merge-request-pipeline.
264 if mr {
266 // niet in een merge-request-pipeline. Behalve als workflow:rules
267 // merge-request-pipelines expliciet toestaat: dan is een MR-pipeline
268 // zonder de gewone jobs nooit de bedoeling (anders ontstaat er geen).
269 if mr && !ev.workflowMR {
265 270 return false, nil
266 271 }
267 272 return true, nil
@@ -116,6 +116,9 @@ func (p Pipeline) Select(ev Eval) ([]Job, error) {
116 if ev.Env == nil {
116 if ev.Env == nil {
117 ev.Env = map[string]string{}
117 ev.Env = map[string]string{}
118 }
118 }
119 if len(p.Workflow) > 0 && ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event" {
120 ev.workflowMR, _ = p.Allow(ev)
121 }
119 var out []Job
122 var out []Job
120 active := map[string]bool{}
123 active := map[string]bool{}
121 var pending []Job
124 var pending []Job
@@ -260,8 +263,10 @@ func onlyExcept(j Job, ev Eval) (bool, error) {
260 mr := ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event"
263 mr := ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event"
261 if len(j.Only) == 0 && len(j.Except) == 0 {
264 if len(j.Only) == 0 && len(j.Except) == 0 {
262 // Zonder rules of only draait een job op een branch of tag,
265 // Zonder rules of only draait een job op een branch of tag,
263 // niet in een merge-request-pipeline.
266 // niet in een merge-request-pipeline. Behalve als workflow:rules
264 if mr {
267 // merge-request-pipelines expliciet toestaat: dan is een MR-pipeline
268 // zonder de gewone jobs nooit de bedoeling (anders ontstaat er geen).
269 if mr && !ev.workflowMR {
265 return false, nil
270 return false, nil
266 }
271 }
267 return true, nil
272 return true, nil
internal/ci/legacy_cycles_test.go added +92 −0
@@ -0,0 +1,92 @@
1 package ci
2
3 import (
4 "os"
5 "reflect"
6 "testing"
7 )
8
9 const lcYML = `stages: [test, build]
10 workflow:
11 rules:
12 - if: $CI_PIPELINE_SOURCE == "merge_request_event"
13 - if: $CI_COMMIT_BRANCH == "master"
14 - if: $CI_PIPELINE_SOURCE == "web"
15 - if: $CI_PIPELINE_SOURCE == "api"
16 .master:
17 rules:
18 - if: $CI_PIPELINE_SOURCE == "merge_request_event"
19 when: never
20 - if: $CI_COMMIT_BRANCH == "master"
21 .rust:
22 image: rust
23 test:
24 extends: .rust
25 stage: test
26 script: [cargo test]
27 build:linux:
28 extends: .rust
29 stage: build
30 script: [build]
31 build:windows:
32 extends: [.rust, .master]
33 stage: build
34 script: [build]
35 `
36
37 func lcJobs(t *testing.T, yml, src, branch string) []string {
38 t.Helper()
39 spec, err := ParseIn([]byte(yml), func(string) ([]byte, error) { return nil, os.ErrNotExist })
40 if err != nil {
41 t.Fatal(err)
42 }
43 var mr *MRInfo
44 if src == "merge_request_event" {
45 mr = &MRInfo{ID: 1, IID: 1, SourceBranch: branch, TargetBranch: "master"}
46 }
47 ev := Eval{Env: Variables(Ref{SHA: "abc", FullRef: "refs/heads/" + branch, Name: branch, Kind: "branch", DefaultBranch: "master", Source: src, MR: mr})}
48 ok, err := spec.Allow(ev)
49 if err != nil {
50 t.Fatal(err)
51 }
52 if !ok {
53 return nil
54 }
55 js, err := spec.Select(ev)
56 if err != nil {
57 t.Fatal(err)
58 }
59 names := []string{}
60 for _, j := range js {
61 names = append(names, j.Name)
62 }
63 return names
64 }
65
66 func TestLegacyCyclesPipelines(t *testing.T) {
67 cases := []struct {
68 src, branch string
69 want []string
70 }{
71 // workflow staat MR-pipelines toe: jobs zonder rules draaien mee.
72 {"merge_request_event", "ada/x", []string{"test", "build:linux"}},
73 // geërfde rules (extends .master) gelden ook bij api en web.
74 {"api", "ada/x", []string{"test", "build:linux"}},
75 {"web", "ada/x", []string{"test", "build:linux"}},
76 {"push", "ada/x", nil},
77 {"push", "master", []string{"test", "build:linux", "build:windows"}},
78 {"api", "master", []string{"test", "build:linux", "build:windows"}},
79 }
80 for _, c := range cases {
81 if got := lcJobs(t, lcYML, c.src, c.branch); !reflect.DeepEqual(got, c.want) && !(len(got) == 0 && len(c.want) == 0) {
82 t.Errorf("%s op %s: %v, wil %v", c.src, c.branch, got, c.want)
83 }
84 }
85 }
86
87 func TestPlainJobsSkipMRWithoutWorkflow(t *testing.T) {
88 yml := "test:\n image: alpine\n script: [x]\n"
89 if got := lcJobs(t, yml, "merge_request_event", "ada/x"); len(got) != 0 {
90 t.Fatalf("zonder workflow hoort een gewone job niet in een MR-pipeline (GitLab): %v", got)
91 }
92 }
@@ -0,0 +1,92 @@
1package ci
2
3import (
4 "os"
5 "reflect"
6 "testing"
7)
8
9const lcYML = `stages: [test, build]
10workflow:
11 rules:
12 - if: $CI_PIPELINE_SOURCE == "merge_request_event"
13 - if: $CI_COMMIT_BRANCH == "master"
14 - if: $CI_PIPELINE_SOURCE == "web"
15 - if: $CI_PIPELINE_SOURCE == "api"
16.master:
17 rules:
18 - if: $CI_PIPELINE_SOURCE == "merge_request_event"
19 when: never
20 - if: $CI_COMMIT_BRANCH == "master"
21.rust:
22 image: rust
23test:
24 extends: .rust
25 stage: test
26 script: [cargo test]
27build:linux:
28 extends: .rust
29 stage: build
30 script: [build]
31build:windows:
32 extends: [.rust, .master]
33 stage: build
34 script: [build]
35`
36
37func lcJobs(t *testing.T, yml, src, branch string) []string {
38 t.Helper()
39 spec, err := ParseIn([]byte(yml), func(string) ([]byte, error) { return nil, os.ErrNotExist })
40 if err != nil {
41 t.Fatal(err)
42 }
43 var mr *MRInfo
44 if src == "merge_request_event" {
45 mr = &MRInfo{ID: 1, IID: 1, SourceBranch: branch, TargetBranch: "master"}
46 }
47 ev := Eval{Env: Variables(Ref{SHA: "abc", FullRef: "refs/heads/" + branch, Name: branch, Kind: "branch", DefaultBranch: "master", Source: src, MR: mr})}
48 ok, err := spec.Allow(ev)
49 if err != nil {
50 t.Fatal(err)
51 }
52 if !ok {
53 return nil
54 }
55 js, err := spec.Select(ev)
56 if err != nil {
57 t.Fatal(err)
58 }
59 names := []string{}
60 for _, j := range js {
61 names = append(names, j.Name)
62 }
63 return names
64}
65
66func TestLegacyCyclesPipelines(t *testing.T) {
67 cases := []struct {
68 src, branch string
69 want []string
70 }{
71 // workflow staat MR-pipelines toe: jobs zonder rules draaien mee.
72 {"merge_request_event", "ada/x", []string{"test", "build:linux"}},
73 // geërfde rules (extends .master) gelden ook bij api en web.
74 {"api", "ada/x", []string{"test", "build:linux"}},
75 {"web", "ada/x", []string{"test", "build:linux"}},
76 {"push", "ada/x", nil},
77 {"push", "master", []string{"test", "build:linux", "build:windows"}},
78 {"api", "master", []string{"test", "build:linux", "build:windows"}},
79 }
80 for _, c := range cases {
81 if got := lcJobs(t, lcYML, c.src, c.branch); !reflect.DeepEqual(got, c.want) && !(len(got) == 0 && len(c.want) == 0) {
82 t.Errorf("%s op %s: %v, wil %v", c.src, c.branch, got, c.want)
83 }
84 }
85}
86
87func TestPlainJobsSkipMRWithoutWorkflow(t *testing.T) {
88 yml := "test:\n image: alpine\n script: [x]\n"
89 if got := lcJobs(t, yml, "merge_request_event", "ada/x"); len(got) != 0 {
90 t.Fatalf("zonder workflow hoort een gewone job niet in een MR-pipeline (GitLab): %v", got)
91 }
92}
internal/ci/model.go +3 −0
@@ -111,6 +111,9 @@ type Eval struct {
111 111 Env map[string]string
112 112 Changed []string
113 113 Files []string
114 // workflowMR: workflow:rules staat merge-request-pipelines expliciet
115 // toe. Jobs zonder rules of only draaien dan ook daarin.
116 workflowMR bool
114 117 }
115 118
116 119 // MRInfo is de merge request waar een pipeline bij hoort.
@@ -111,6 +111,9 @@ type Eval struct {
111 Env map[string]string
111 Env map[string]string
112 Changed []string
112 Changed []string
113 Files []string
113 Files []string
114 // workflowMR: workflow:rules staat merge-request-pipelines expliciet
115 // toe. Jobs zonder rules of only draaien dan ook daarin.
116 workflowMR bool
114}
117}
115
118
116// MRInfo is de merge request waar een pipeline bij hoort.
119// MRInfo is de merge request waar een pipeline bij hoort.
internal/runner/clone_test.go added +43 −0
@@ -0,0 +1,43 @@
1 package runner
2
3 import (
4 "os"
5 "os/exec"
6 "path/filepath"
7 "testing"
8 )
9
10 func TestCloneCopiesObjects(t *testing.T) {
11 if _, err := exec.LookPath("git"); err != nil {
12 t.Skip("git ontbreekt")
13 }
14 src := t.TempDir()
15 run := func(dir string, args ...string) {
16 cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
17 cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t")
18 if out, err := cmd.CombinedOutput(); err != nil {
19 t.Fatalf("%v: %s", args, out)
20 }
21 }
22 run(src, "init", "-q", "-b", "master")
23 _ = os.WriteFile(filepath.Join(src, "a"), []byte("a"), 0o644)
24 run(src, "add", "a")
25 run(src, "commit", "-qm", "a")
26 bare := filepath.Join(t.TempDir(), "r.git")
27 if out, err := exec.Command("git", "clone", "-q", "--bare", src, bare).CombinedOutput(); err != nil {
28 t.Fatal(string(out))
29 }
30 work := filepath.Join(t.TempDir(), "w")
31 if out, err := exec.Command("git", cloneArgs(bare, work)...).CombinedOutput(); err != nil {
32 t.Fatal(string(out))
33 }
34 // geen gedeelde inodes met de bare repo
35 _ = filepath.Walk(filepath.Join(work, ".git", "objects"), func(p string, info os.FileInfo, err error) error {
36 if err == nil && !info.IsDir() {
37 if st, ok := sysNlink(info); ok && st > 1 {
38 t.Fatalf("hardlink: %s", p)
39 }
40 }
41 return nil
42 })
43 }
@@ -0,0 +1,43 @@
1package runner
2
3import (
4 "os"
5 "os/exec"
6 "path/filepath"
7 "testing"
8)
9
10func TestCloneCopiesObjects(t *testing.T) {
11 if _, err := exec.LookPath("git"); err != nil {
12 t.Skip("git ontbreekt")
13 }
14 src := t.TempDir()
15 run := func(dir string, args ...string) {
16 cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
17 cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t")
18 if out, err := cmd.CombinedOutput(); err != nil {
19 t.Fatalf("%v: %s", args, out)
20 }
21 }
22 run(src, "init", "-q", "-b", "master")
23 _ = os.WriteFile(filepath.Join(src, "a"), []byte("a"), 0o644)
24 run(src, "add", "a")
25 run(src, "commit", "-qm", "a")
26 bare := filepath.Join(t.TempDir(), "r.git")
27 if out, err := exec.Command("git", "clone", "-q", "--bare", src, bare).CombinedOutput(); err != nil {
28 t.Fatal(string(out))
29 }
30 work := filepath.Join(t.TempDir(), "w")
31 if out, err := exec.Command("git", cloneArgs(bare, work)...).CombinedOutput(); err != nil {
32 t.Fatal(string(out))
33 }
34 // geen gedeelde inodes met de bare repo
35 _ = filepath.Walk(filepath.Join(work, ".git", "objects"), func(p string, info os.FileInfo, err error) error {
36 if err == nil && !info.IsDir() {
37 if st, ok := sysNlink(info); ok && st > 1 {
38 t.Fatalf("hardlink: %s", p)
39 }
40 }
41 return nil
42 })
43}
internal/runner/runner.go +8 −1
@@ -342,7 +342,7 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
342 342 return nil, err
343 343 }
344 344 bare := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
345 if _, err := execOut(ctx, r.GitBin, "clone", "--local", bare, work); err != nil {
345 if _, err := execOut(ctx, r.GitBin, cloneArgs(bare, work)...); err != nil {
346 346 sink.closeSection()
347 347 return nil, fmt.Errorf("clone: %w", err)
348 348 }
@@ -1076,3 +1076,10 @@ func execOut(ctx context.Context, bin string, args ...string) (string, error) {
1076 1076 }
1077 1077 return stdout.String(), nil
1078 1078 }
1079
1080 // cloneArgs kopieert de objecten in plaats van hardlinks te maken: de
1081 // werkmap en de bare repo kunnen andere eigenaars hebben, en met
1082 // fs.protected_hardlinks geeft link() dan "Operation not permitted".
1083 func cloneArgs(bare, work string) []string {
1084 return []string{"clone", "--no-hardlinks", bare, work}
1085 }
@@ -342,7 +342,7 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
342 return nil, err
342 return nil, err
343 }
343 }
344 bare := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
344 bare := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
345 if _, err := execOut(ctx, r.GitBin, "clone", "--local", bare, work); err != nil {
345 if _, err := execOut(ctx, r.GitBin, cloneArgs(bare, work)...); err != nil {
346 sink.closeSection()
346 sink.closeSection()
347 return nil, fmt.Errorf("clone: %w", err)
347 return nil, fmt.Errorf("clone: %w", err)
348 }
348 }
@@ -1076,3 +1076,10 @@ func execOut(ctx context.Context, bin string, args ...string) (string, error) {
1076 }
1076 }
1077 return stdout.String(), nil
1077 return stdout.String(), nil
1078}
1078}
1079
1080// cloneArgs kopieert de objecten in plaats van hardlinks te maken: de
1081// werkmap en de bare repo kunnen andere eigenaars hebben, en met
1082// fs.protected_hardlinks geeft link() dan "Operation not permitted".
1083func cloneArgs(bare, work string) []string {
1084 return []string{"clone", "--no-hardlinks", bare, work}
1085}