Merged
fix(ci): runner-clone zonder hardlinks, MR-pipelines met gewone jobs
timfa
wants to merge
1 commit
from
cursor/runner-fixes
into
stage
Overview Commits 1 Pipelines 3 Changes 6
Gevonden bij timfa/legacy-cycles.
1. Clone: git clone --local maakte hardlinks naar de bare repo. Dat gaf failed to create link … Operation not permitted (andere eigenaar + fs.protected_hardlinks). Nu is het --no-hardlinks. Test: internal/runner/clone_test.go (geen gedeelde inodes). 2. Geen MR-pipeline: jobs zonder rules/only draaiden niet in een merge_request_event-pipeline (de GitLab-standaard). Met alleen zulke jobs plus .master-jobs met when: never bleven er 0 jobs over, en dus kwam er geen pipeline. Nu draaien zulke jobs wel mee als workflow:rules MR-pipelines expliciet toestaat. Zonder workflow blijft het zoals in GitLab. 3. Geërfde rules bij api/web: dat werkte in BlueGit al goed. De test (internal/ci/legacy_cycles_test.go) bewijst dat extends: .master met rules bij api/web op een branch alleen test en build:linux geeft. De oorzaak zat in de config van legacy-cycles: .master had zelf if: api en if: web.
Activity
- timfa Pipeline #175 is Passed 24 October 2026
- timfa opened this merge request 24 October 2026
- timfa Pipeline #177 is Passed 24 October 2026
- timfa Pipeline #178 is Passed 24 October 2026
-
timfa
pushed
24 October 2026
fix(ci): clone zonder hardlinks; MR-pipeline met gewone jobs als workflow MR's toestaat Merge branch 'cursor/read-cache' into 'stage' feat: optionele leescache voor overzichtspagina's (instelbaar pad, LRU, write-through bij push)
- timfa merged this merge request 24 October 2026
Commits
Pipelines
Changes
@@ -116,6 +116,9 @@ func (p Pipeline) Select(ev Eval) ([]Job, error) {
if ev.Env == nil {
ev.Env = map[string]string{}
}
if len(p.Workflow) > 0 && ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event" {
ev.workflowMR, _ = p.Allow(ev)
}
var out []Job
active := map[string]bool{}
var pending []Job
@@ -260,8 +263,10 @@ func onlyExcept(j Job, ev Eval) (bool, error) {
mr := ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event"
if len(j.Only) == 0 && len(j.Except) == 0 {
// Zonder rules of only draait een job op een branch of tag,
// niet in een merge-request-pipeline.
if mr {
// niet in een merge-request-pipeline. Behalve als workflow:rules
// merge-request-pipelines expliciet toestaat: dan is een MR-pipeline
// zonder de gewone jobs nooit de bedoeling (anders ontstaat er geen).
if mr && !ev.workflowMR {
return false, nil
}
return true, nil
@@ -116,6 +116,9 @@ func (p Pipeline) Select(ev Eval) ([]Job, error) { if ev.Env == nil { if ev.Env == nil { ev.Env = map[string]string{} ev.Env = map[string]string{} } } if len(p.Workflow) > 0 && ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event" { ev.workflowMR, _ = p.Allow(ev) } var out []Job var out []Job active := map[string]bool{} active := map[string]bool{} var pending []Job var pending []Job@@ -260,8 +263,10 @@ func onlyExcept(j Job, ev Eval) (bool, error) { mr := ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event" mr := ev.Env["CI_PIPELINE_SOURCE"] == "merge_request_event" if len(j.Only) == 0 && len(j.Except) == 0 { if len(j.Only) == 0 && len(j.Except) == 0 { // Zonder rules of only draait een job op een branch of tag, // Zonder rules of only draait een job op een branch of tag, // niet in een merge-request-pipeline. // niet in een merge-request-pipeline. Behalve als workflow:rules if mr { // merge-request-pipelines expliciet toestaat: dan is een MR-pipeline // zonder de gewone jobs nooit de bedoeling (anders ontstaat er geen). if mr && !ev.workflowMR { return false, nil return false, nil } } return true, nil return true, nil@@ -0,0 +1,92 @@
package ci
import (
"os"
"reflect"
"testing"
)
const lcYML = `stages: [test, build]
workflow:
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_COMMIT_BRANCH == "master"
- if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "api"
.master:
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: never
- if: $CI_COMMIT_BRANCH == "master"
.rust:
image: rust
test:
extends: .rust
stage: test
script: [cargo test]
build:linux:
extends: .rust
stage: build
script: [build]
build:windows:
extends: [.rust, .master]
stage: build
script: [build]
`
func lcJobs(t *testing.T, yml, src, branch string) []string {
t.Helper()
spec, err := ParseIn([]byte(yml), func(string) ([]byte, error) { return nil, os.ErrNotExist })
if err != nil {
t.Fatal(err)
}
var mr *MRInfo
if src == "merge_request_event" {
mr = &MRInfo{ID: 1, IID: 1, SourceBranch: branch, TargetBranch: "master"}
}
ev := Eval{Env: Variables(Ref{SHA: "abc", FullRef: "refs/heads/" + branch, Name: branch, Kind: "branch", DefaultBranch: "master", Source: src, MR: mr})}
ok, err := spec.Allow(ev)
if err != nil {
t.Fatal(err)
}
if !ok {
return nil
}
js, err := spec.Select(ev)
if err != nil {
t.Fatal(err)
}
names := []string{}
for _, j := range js {
names = append(names, j.Name)
}
return names
}
func TestLegacyCyclesPipelines(t *testing.T) {
cases := []struct {
src, branch string
want []string
}{
// workflow staat MR-pipelines toe: jobs zonder rules draaien mee.
{"merge_request_event", "ada/x", []string{"test", "build:linux"}},
// geërfde rules (extends .master) gelden ook bij api en web.
{"api", "ada/x", []string{"test", "build:linux"}},
{"web", "ada/x", []string{"test", "build:linux"}},
{"push", "ada/x", nil},
{"push", "master", []string{"test", "build:linux", "build:windows"}},
{"api", "master", []string{"test", "build:linux", "build:windows"}},
}
for _, c := range cases {
if got := lcJobs(t, lcYML, c.src, c.branch); !reflect.DeepEqual(got, c.want) && !(len(got) == 0 && len(c.want) == 0) {
t.Errorf("%s op %s: %v, wil %v", c.src, c.branch, got, c.want)
}
}
}
func TestPlainJobsSkipMRWithoutWorkflow(t *testing.T) {
yml := "test:\n image: alpine\n script: [x]\n"
if got := lcJobs(t, yml, "merge_request_event", "ada/x"); len(got) != 0 {
t.Fatalf("zonder workflow hoort een gewone job niet in een MR-pipeline (GitLab): %v", got)
}
}
@@ -0,0 +1,92 @@package ciimport ( "os" "reflect" "testing")const lcYML = `stages: [test, build]workflow: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_COMMIT_BRANCH == "master" - if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "api".master: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: never - if: $CI_COMMIT_BRANCH == "master".rust: image: rusttest: extends: .rust stage: test script: [cargo test]build:linux: extends: .rust stage: build script: [build]build:windows: extends: [.rust, .master] stage: build script: [build]`func lcJobs(t *testing.T, yml, src, branch string) []string { t.Helper() spec, err := ParseIn([]byte(yml), func(string) ([]byte, error) { return nil, os.ErrNotExist }) if err != nil { t.Fatal(err) } var mr *MRInfo if src == "merge_request_event" { mr = &MRInfo{ID: 1, IID: 1, SourceBranch: branch, TargetBranch: "master"} } ev := Eval{Env: Variables(Ref{SHA: "abc", FullRef: "refs/heads/" + branch, Name: branch, Kind: "branch", DefaultBranch: "master", Source: src, MR: mr})} ok, err := spec.Allow(ev) if err != nil { t.Fatal(err) } if !ok { return nil } js, err := spec.Select(ev) if err != nil { t.Fatal(err) } names := []string{} for _, j := range js { names = append(names, j.Name) } return names}func TestLegacyCyclesPipelines(t *testing.T) { cases := []struct { src, branch string want []string }{ // workflow staat MR-pipelines toe: jobs zonder rules draaien mee. {"merge_request_event", "ada/x", []string{"test", "build:linux"}}, // geërfde rules (extends .master) gelden ook bij api en web. {"api", "ada/x", []string{"test", "build:linux"}}, {"web", "ada/x", []string{"test", "build:linux"}}, {"push", "ada/x", nil}, {"push", "master", []string{"test", "build:linux", "build:windows"}}, {"api", "master", []string{"test", "build:linux", "build:windows"}}, } for _, c := range cases { if got := lcJobs(t, lcYML, c.src, c.branch); !reflect.DeepEqual(got, c.want) && !(len(got) == 0 && len(c.want) == 0) { t.Errorf("%s op %s: %v, wil %v", c.src, c.branch, got, c.want) } }}func TestPlainJobsSkipMRWithoutWorkflow(t *testing.T) { yml := "test:\n image: alpine\n script: [x]\n" if got := lcJobs(t, yml, "merge_request_event", "ada/x"); len(got) != 0 { t.Fatalf("zonder workflow hoort een gewone job niet in een MR-pipeline (GitLab): %v", got) }}@@ -111,6 +111,9 @@ type Eval struct {
Env map[string]string
Changed []string
Files []string
// workflowMR: workflow:rules staat merge-request-pipelines expliciet
// toe. Jobs zonder rules of only draaien dan ook daarin.
workflowMR bool
}
// MRInfo is de merge request waar een pipeline bij hoort.
@@ -111,6 +111,9 @@ type Eval struct { Env map[string]string Env map[string]string Changed []string Changed []string Files []string Files []string // workflowMR: workflow:rules staat merge-request-pipelines expliciet // toe. Jobs zonder rules of only draaien dan ook daarin. workflowMR bool}}// MRInfo is de merge request waar een pipeline bij hoort.// MRInfo is de merge request waar een pipeline bij hoort.@@ -0,0 +1,43 @@
package runner
import (
"os"
"os/exec"
"path/filepath"
"testing"
)
func TestCloneCopiesObjects(t *testing.T) {
if _, err := exec.LookPath("git"); err != nil {
t.Skip("git ontbreekt")
}
src := t.TempDir()
run := func(dir string, args ...string) {
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t")
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("%v: %s", args, out)
}
}
run(src, "init", "-q", "-b", "master")
_ = os.WriteFile(filepath.Join(src, "a"), []byte("a"), 0o644)
run(src, "add", "a")
run(src, "commit", "-qm", "a")
bare := filepath.Join(t.TempDir(), "r.git")
if out, err := exec.Command("git", "clone", "-q", "--bare", src, bare).CombinedOutput(); err != nil {
t.Fatal(string(out))
}
work := filepath.Join(t.TempDir(), "w")
if out, err := exec.Command("git", cloneArgs(bare, work)...).CombinedOutput(); err != nil {
t.Fatal(string(out))
}
// geen gedeelde inodes met de bare repo
_ = filepath.Walk(filepath.Join(work, ".git", "objects"), func(p string, info os.FileInfo, err error) error {
if err == nil && !info.IsDir() {
if st, ok := sysNlink(info); ok && st > 1 {
t.Fatalf("hardlink: %s", p)
}
}
return nil
})
}
@@ -0,0 +1,43 @@package runnerimport ( "os" "os/exec" "path/filepath" "testing")func TestCloneCopiesObjects(t *testing.T) { if _, err := exec.LookPath("git"); err != nil { t.Skip("git ontbreekt") } src := t.TempDir() run := func(dir string, args ...string) { cmd := exec.Command("git", append([]string{"-C", dir}, args...)...) cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t") if out, err := cmd.CombinedOutput(); err != nil { t.Fatalf("%v: %s", args, out) } } run(src, "init", "-q", "-b", "master") _ = os.WriteFile(filepath.Join(src, "a"), []byte("a"), 0o644) run(src, "add", "a") run(src, "commit", "-qm", "a") bare := filepath.Join(t.TempDir(), "r.git") if out, err := exec.Command("git", "clone", "-q", "--bare", src, bare).CombinedOutput(); err != nil { t.Fatal(string(out)) } work := filepath.Join(t.TempDir(), "w") if out, err := exec.Command("git", cloneArgs(bare, work)...).CombinedOutput(); err != nil { t.Fatal(string(out)) } // geen gedeelde inodes met de bare repo _ = filepath.Walk(filepath.Join(work, ".git", "objects"), func(p string, info os.FileInfo, err error) error { if err == nil && !info.IsDir() { if st, ok := sysNlink(info); ok && st > 1 { t.Fatalf("hardlink: %s", p) } } return nil })}@@ -0,0 +1,16 @@
//go:build unix
package runner
import (
"os"
"syscall"
)
func sysNlink(info os.FileInfo) (uint64, bool) {
st, ok := info.Sys().(*syscall.Stat_t)
if !ok {
return 0, false
}
return uint64(st.Nlink), true
}
@@ -0,0 +1,16 @@//go:build unixpackage runnerimport ( "os" "syscall")func sysNlink(info os.FileInfo) (uint64, bool) { st, ok := info.Sys().(*syscall.Stat_t) if !ok { return 0, false } return uint64(st.Nlink), true}@@ -342,7 +342,7 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
return nil, err
}
bare := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
if _, err := execOut(ctx, r.GitBin, "clone", "--local", bare, work); err != nil {
if _, err := execOut(ctx, r.GitBin, cloneArgs(bare, work)...); err != nil {
sink.closeSection()
return nil, fmt.Errorf("clone: %w", err)
}
@@ -1076,3 +1076,10 @@ func execOut(ctx context.Context, bin string, args ...string) (string, error) {
}
return stdout.String(), nil
}
// cloneArgs kopieert de objecten in plaats van hardlinks te maken: de
// werkmap en de bare repo kunnen andere eigenaars hebben, en met
// fs.protected_hardlinks geeft link() dan "Operation not permitted".
func cloneArgs(bare, work string) []string {
return []string{"clone", "--no-hardlinks", bare, work}
}
@@ -342,7 +342,7 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([ return nil, err return nil, err } } bare := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name) bare := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name) if _, err := execOut(ctx, r.GitBin, "clone", "--local", bare, work); err != nil { if _, err := execOut(ctx, r.GitBin, cloneArgs(bare, work)...); err != nil { sink.closeSection() sink.closeSection() return nil, fmt.Errorf("clone: %w", err) return nil, fmt.Errorf("clone: %w", err) } }@@ -1076,3 +1076,10 @@ func execOut(ctx context.Context, bin string, args ...string) (string, error) { } } return stdout.String(), nil return stdout.String(), nil}}// cloneArgs kopieert de objecten in plaats van hardlinks te maken: de// werkmap en de bare repo kunnen andere eigenaars hebben, en met// fs.protected_hardlinks geeft link() dan "Operation not permitted".func cloneArgs(bare, work string) []string { return []string{"clone", "--no-hardlinks", bare, work}}