fix: start een pipeline na commits vanuit de UI
Elke commit die BlueGit zelf maakt loopt door dezelfde post-receive-route als een git push, inclusief webhook en activity. Lopende jobs tonen een spinner, en het repo-overzicht toont de pipelinestatus bij de commit. Co-authored-by: tim <tim@timfalken.com>
@@ -109,7 +109,9 @@ Het commit moet in de repository bestaan. Het asset moet een artifact zijn van e
109
109
110
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.
111
111
112
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen.
112
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen. Een lopende job is een blauw icoon met een spinner; `pending` en `created` zijn een holle grijze cirkel. De commitbalk op het repo-overzicht toont diezelfde status.
113
114
Een commit die BlueGit zelf maakt loopt door één post-receive-route, dezelfde als een `git push`. Dat geldt voor de Pipeline Editor, het toepassen van een suggestie, het mergen van een merge request en een tag die in de interface of via de release-API ontstaat. Die route start de pipeline, de push-webhook en de activity.
113
115
114
116
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).
115
117
@@ -109,7 +109,9 @@ Het commit moet in de repository bestaan. Het asset moet een artifact zijn van e109
109
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.111
111
112
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen.112
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen. Een lopende job is een blauw icoon met een spinner; `pending` en `created` zijn een holle grijze cirkel. De commitbalk op het repo-overzicht toont diezelfde status.113
114
Een commit die BlueGit zelf maakt loopt door één post-receive-route, dezelfde als een `git push`. Dat geldt voor de Pipeline Editor, het toepassen van een suggestie, het mergen van een merge request en een tag die in de interface of via de release-API ontstaat. Die route start de pipeline, de push-webhook en de activity.113
115
114
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).116
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).115
117
@@ -661,7 +661,8 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai
661
661
if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {
662
662
return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
663
663
}
664
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {
664
// De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.
665
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {
665
666
return i18n.E("err.mergeConflict")
666
667
}
667
668
pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
@@ -661,7 +661,8 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai661
if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {661
if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {662
return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))662
return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))663
}663
}664
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {664
// De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.665
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {665
return i18n.E("err.mergeConflict")666
return i18n.E("err.mergeConflict")666
}667
}667
pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)668
pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)@@ -41,6 +41,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
41
41
token := bearer(r)
42
42
var job store.Job
43
43
var author int64
44
var actor store.User
44
45
if strings.HasPrefix(token, "bgj_") {
45
46
job, err = s.Store.JobByToken(r.Context(), token)
46
47
if err != nil || job.RepoID != repo.ID || job.Status != "running" {
@@ -59,6 +60,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
59
60
return
60
61
}
61
62
author = u.ID
63
actor = u
62
64
} else {
63
65
http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
64
66
return
@@ -118,7 +120,9 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
118
120
}
119
121
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
120
122
}
121
if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {
123
if err := s.postReceive(r.Context(), repo, actor, dir, func() error {
124
return gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name)
125
}); err != nil {
122
126
http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)
123
127
return
124
128
}
@@ -41,6 +41,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {41
token := bearer(r)41
token := bearer(r)42
var job store.Job42
var job store.Job43
var author int6443
var author int6444
var actor store.User44
if strings.HasPrefix(token, "bgj_") {45
if strings.HasPrefix(token, "bgj_") {45
job, err = s.Store.JobByToken(r.Context(), token)46
job, err = s.Store.JobByToken(r.Context(), token)46
if err != nil || job.RepoID != repo.ID || job.Status != "running" {47
if err != nil || job.RepoID != repo.ID || job.Status != "running" {@@ -59,6 +60,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {59
return60
return60
}61
}61
author = u.ID62
author = u.ID63
actor = u62
} else {64
} else {63
http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)65
http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)64
return66
return@@ -118,7 +120,9 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {118
}120
}119
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})121
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})120
}122
}121
if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {123
if err := s.postReceive(r.Context(), repo, actor, dir, func() error {124
return gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name)125
}); err != nil {122
http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)126
http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)123
return127
return124
}128
}@@ -176,7 +176,9 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
176
176
return
177
177
}
178
178
email := u.Username + "@users.git.timfalken.com"
179
err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
179
err = s.postReceive(r.Context(), repo, u, dir, func() error {
180
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
181
})
180
182
if err != nil {
181
183
s.redirect(w, r, back, "", s.commitProblem(r, err))
182
184
return
@@ -176,7 +176,9 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {176
return176
return177
}177
}178
email := u.Username + "@users.git.timfalken.com"178
email := u.Username + "@users.git.timfalken.com"179
err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)179
err = s.postReceive(r.Context(), repo, u, dir, func() error {180
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)181
})180
if err != nil {182
if err != nil {181
s.redirect(w, r, back, "", s.commitProblem(r, err))183
s.redirect(w, r, back, "", s.commitProblem(r, err))182
return184
return@@ -19,20 +19,45 @@ import (
19
19
"gitlab.com/Timfa/bluegit/internal/webhook"
20
20
)
21
21
22
// postReceive is de enige route voor een ref-wijziging die BlueGit zelf maakt:
23
// de Pipeline Editor, suggesties, een merge en een tag. mutate schrijft de refs.
24
// Daarna geldt hetzelfde als na een git push: pipeline, webhook en activity.
25
func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.User, dir string, mutate func() error) error {
26
before, err := gitrepo.Refs(ctx, s.Git, dir)
27
if err != nil {
28
before = map[string]string{}
29
}
30
if err := mutate(); err != nil {
31
return err
32
}
33
after, err := gitrepo.Refs(ctx, s.Git, dir)
34
if err != nil {
35
if s.Log != nil {
36
s.Log.Error("post-receive", "err", err)
37
}
38
return nil
39
}
40
s.AfterPush(repo, user, before, after)
41
return nil
42
}
43
44
// AfterPush behandelt elke nieuwe ref zoals een git push.
45
// git http, SSH en postReceive zijn de enige aanroepers.
22
46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {
23
47
if after == nil {
24
48
return
25
49
}
26
50
actor := user.Username
27
51
for ref, sha := range after {
28
if before[ref] == sha {
29
continue
30
}
31
if isZero(sha) {
52
if before[ref] == sha || isZero(sha) {
32
53
continue
33
54
}
55
commit := s.peeled(repo, sha)
34
56
if strings.HasPrefix(ref, "refs/tags/") {
35
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)
57
name := strings.TrimPrefix(ref, "refs/tags/")
58
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
59
s.recordContribution(user.ID, repo.ID, "tag", ref, time.Now().UTC())
60
s.pushHook(repo, actor, name, commit)
36
61
continue
37
62
}
38
63
branch, ok := gitrepo.BranchOfRef(ref)
@@ -40,20 +65,34 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
40
65
continue
41
66
}
42
67
s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
43
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)
44
s.startMergeRequestPipelines(context.Background(), repo, sha, branch, actor, before[ref])
68
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
69
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])
45
70
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
46
web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()
47
s.Dispatch(repo.ID, webhook.Event{
48
Type: webhook.EventPush,
49
Project: repo.FullPath(),
50
Branch: branch,
51
Commit: sha,
52
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),
53
URL: web,
54
Actor: actor,
55
})
71
s.pushHook(repo, actor, branch, commit)
72
}
73
}
74
75
func (s *Server) pushHook(repo store.Repo, actor, branch, commit string) {
76
s.Dispatch(repo.ID, webhook.Event{
77
Type: webhook.EventPush,
78
Project: repo.FullPath(),
79
Branch: branch,
80
Commit: commit,
81
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),
82
URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),
83
Actor: actor,
84
})
85
}
86
87
func (s *Server) peeled(repo store.Repo, sha string) string {
88
if s.StoragePath() == "" || sha == "" {
89
return sha
90
}
91
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
92
if commit := gitOne(context.Background(), s.Git, dir, "rev-parse", "--verify", sha+"^{commit}"); commit != "" {
93
return commit
56
94
}
95
return sha
57
96
}
58
97
59
98
func isZero(sha string) bool {
@@ -19,20 +19,45 @@ import (19
"gitlab.com/Timfa/bluegit/internal/webhook"19
"gitlab.com/Timfa/bluegit/internal/webhook"20
)20
)21
21
22
// postReceive is de enige route voor een ref-wijziging die BlueGit zelf maakt:23
// de Pipeline Editor, suggesties, een merge en een tag. mutate schrijft de refs.24
// Daarna geldt hetzelfde als na een git push: pipeline, webhook en activity.25
func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.User, dir string, mutate func() error) error {26
before, err := gitrepo.Refs(ctx, s.Git, dir)27
if err != nil {28
before = map[string]string{}29
}30
if err := mutate(); err != nil {31
return err32
}33
after, err := gitrepo.Refs(ctx, s.Git, dir)34
if err != nil {35
if s.Log != nil {36
s.Log.Error("post-receive", "err", err)37
}38
return nil39
}40
s.AfterPush(repo, user, before, after)41
return nil42
}43
44
// AfterPush behandelt elke nieuwe ref zoals een git push.45
// git http, SSH en postReceive zijn de enige aanroepers.22
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {23
if after == nil {47
if after == nil {24
return48
return25
}49
}26
actor := user.Username50
actor := user.Username27
for ref, sha := range after {51
for ref, sha := range after {28
if before[ref] == sha {52
if before[ref] == sha || isZero(sha) {29
continue30
}31
if isZero(sha) {32
continue53
continue33
}54
}55
commit := s.peeled(repo, sha)34
if strings.HasPrefix(ref, "refs/tags/") {56
if strings.HasPrefix(ref, "refs/tags/") {35
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)57
name := strings.TrimPrefix(ref, "refs/tags/")58
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)59
s.recordContribution(user.ID, repo.ID, "tag", ref, time.Now().UTC())60
s.pushHook(repo, actor, name, commit)36
continue61
continue37
}62
}38
branch, ok := gitrepo.BranchOfRef(ref)63
branch, ok := gitrepo.BranchOfRef(ref)@@ -40,20 +65,34 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s40
continue65
continue41
}66
}42
s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})67
s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})43
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)68
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)44
s.startMergeRequestPipelines(context.Background(), repo, sha, branch, actor, before[ref])69
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])45
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)70
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)46
web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()71
s.pushHook(repo, actor, branch, commit)47
s.Dispatch(repo.ID, webhook.Event{72
}48
Type: webhook.EventPush,73
}49
Project: repo.FullPath(),74
50
Branch: branch,75
func (s *Server) pushHook(repo store.Repo, actor, branch, commit string) {51
Commit: sha,76
s.Dispatch(repo.ID, webhook.Event{52
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),77
Type: webhook.EventPush,53
URL: web,78
Project: repo.FullPath(),54
Actor: actor,79
Branch: branch,55
})80
Commit: commit,81
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),82
URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),83
Actor: actor,84
})85
}86
87
func (s *Server) peeled(repo store.Repo, sha string) string {88
if s.StoragePath() == "" || sha == "" {89
return sha90
}91
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)92
if commit := gitOne(context.Background(), s.Git, dir, "rev-parse", "--verify", sha+"^{commit}"); commit != "" {93
return commit56
}94
}95
return sha57
}96
}58
97
59
func isZero(sha string) bool {98
func isZero(sha string) bool {@@ -1,6 +1,7 @@
1
1
package server
2
2
3
3
import (
4
"context"
4
5
"fmt"
5
6
"html/template"
6
7
"net/http"
@@ -23,6 +24,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
23
24
lang := i18n.Parse(v.Lang)
24
25
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
25
26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
27
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
26
28
v.Head = &rows[0]
27
29
}
28
30
}
@@ -82,6 +84,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
82
84
}
83
85
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
84
86
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
87
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
85
88
v.Head = &rows[0]
86
89
}
87
90
}
@@ -103,6 +106,21 @@ func (s *Server) branchList(r *http.Request, v *View, dir string) {
103
106
}
104
107
}
105
108
109
func (s *Server) attachHeadPipeline(ctx context.Context, repo store.Repo, row *CommitRow, lang i18n.Lang) {
110
if row == nil || row.SHA == "" || s.Store == nil {
111
return
112
}
113
p, err := s.Store.LatestPipelineByCommit(ctx, repo.ID, row.SHA)
114
if err != nil {
115
return
116
}
117
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)
118
status := displayStatus(p.Status, jobs)
119
row.PipeID = p.ID
120
row.PipeStatus = status
121
row.PipeLabel = i18n.T(lang, "pipe."+status)
122
}
123
106
124
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {
107
125
var out []FileRow
108
126
for _, e := range entries {
@@ -1,6 +1,7 @@1
package server1
package server2
2
3
import (3
import (4
"context"4
"fmt"5
"fmt"5
"html/template"6
"html/template"6
"net/http"7
"net/http"@@ -23,6 +24,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {23
lang := i18n.Parse(v.Lang)24
lang := i18n.Parse(v.Lang)24
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {25
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {27
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)26
v.Head = &rows[0]28
v.Head = &rows[0]27
}29
}28
}30
}@@ -82,6 +84,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string82
}84
}83
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {85
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {84
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {86
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {87
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)85
v.Head = &rows[0]88
v.Head = &rows[0]86
}89
}87
}90
}@@ -103,6 +106,21 @@ func (s *Server) branchList(r *http.Request, v *View, dir string) {103
}106
}104
}107
}105
108
109
func (s *Server) attachHeadPipeline(ctx context.Context, repo store.Repo, row *CommitRow, lang i18n.Lang) {110
if row == nil || row.SHA == "" || s.Store == nil {111
return112
}113
p, err := s.Store.LatestPipelineByCommit(ctx, repo.ID, row.SHA)114
if err != nil {115
return116
}117
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)118
status := displayStatus(p.Status, jobs)119
row.PipeID = p.ID120
row.PipeStatus = status121
row.PipeLabel = i18n.T(lang, "pipe."+status)122
}123
106
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {124
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {107
var out []FileRow125
var out []FileRow108
for _, e := range entries {126
for _, e := range entries {@@ -0,0 +1,345 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"net/url"
9
"os/exec"
10
"path/filepath"
11
"strings"
12
"testing"
13
"time"
14
15
"gitlab.com/Timfa/bluegit/internal/auth"
16
"gitlab.com/Timfa/bluegit/internal/config"
17
"gitlab.com/Timfa/bluegit/internal/gitrepo"
18
"gitlab.com/Timfa/bluegit/internal/store"
19
)
20
21
const receiveYML = "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo ok\n"
22
23
func TestPostReceiveStartsPipeline(t *testing.T) {
24
if _, err := exec.LookPath("git"); err != nil {
25
t.Skip("git ontbreekt")
26
}
27
storage := t.TempDir()
28
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
29
if err != nil {
30
t.Fatal(err)
31
}
32
t.Cleanup(func() { _ = st.Close() })
33
cfg := config.Config{
34
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
35
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
36
Git: config.Git{Binary: "git", DefaultBranch: "master"},
37
CI: config.CI{Enabled: true, Docker: "docker"},
38
}
39
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
40
ts := httptest.NewServer(srv.Handler())
41
t.Cleanup(ts.Close)
42
jar, _ := cookiejar.New(nil)
43
tim := &http.Client{Jar: jar}
44
res, err := tim.Get(ts.URL + "/login")
45
if err != nil {
46
t.Fatal(err)
47
}
48
page := read(t, res)
49
res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
50
"csrf": {csrfOf(t, page)}, "name": {"ontvangen"}, "visibility": {"public"},
51
})
52
if err != nil {
53
t.Fatal(err)
54
}
55
page = read(t, res)
56
ctx := context.Background()
57
repo, err := st.RepoByPath(ctx, "tim", "ontvangen")
58
if err != nil {
59
t.Fatal(err)
60
}
61
user, err := st.UserByUsername(ctx, "tim")
62
if err != nil {
63
t.Fatal(err)
64
}
65
hookID, err := st.CreateWebhook(ctx, store.Webhook{
66
ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",
67
URLTemplate: "http://127.0.0.1:9/hook", Events: []string{"push"},
68
})
69
if err != nil {
70
t.Fatal(err)
71
}
72
res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
73
if err != nil {
74
t.Fatal(err)
75
}
76
token := between(read(t, res), `<p class="code">`, "</p>")
77
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/ontvangen.git"
78
work := t.TempDir()
79
git(t, work, "init", "-b", "master")
80
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
81
git(t, work, "config", "user.name", "tim")
82
writeFile(t, filepath.Join(work, "README.md"), "hallo\n")
83
git(t, work, "add", "README.md")
84
git(t, work, "commit", "-m", "leesmij")
85
git(t, work, "remote", "add", "origin", remote)
86
git(t, work, "push", "-u", "origin", "master")
87
88
if n := pipelineCount(t, st, repo.ID); n != 0 {
89
t.Fatalf("readme zonder yml startte %d pipelines", n)
90
}
91
pushes := pushDeliveries(t, st, hookID)
92
acts := contribCount(t, st, user.ID, repo.ID)
93
if pushes < 1 || acts < 1 {
94
t.Fatalf("git push: webhooks %d activity %d", pushes, acts)
95
}
96
97
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")
98
if err != nil {
99
t.Fatal(err)
100
}
101
editor := read(t, res)
102
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{
103
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"master"},
104
"message": {"voeg blue-ci-cd.yml toe"}, "body": {receiveYML},
105
})
106
if err != nil {
107
t.Fatal(err)
108
}
109
if saved := read(t, res); !strings.Contains(saved, "Committed.") {
110
t.Fatalf("editor:\n%s", saved)
111
}
112
dir := gitrepo.Dir(storage, "tim", "ontvangen")
113
master := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))
114
pipe := pipelineFor(t, st, repo.ID, master, "refs/heads/master")
115
if pipe.Source != "push" || pipe.Status != "queued" {
116
t.Fatalf("editor-pipeline: %+v", pipe)
117
}
118
if jobs, err := st.JobsByPipeline(ctx, pipe.ID); err != nil || len(jobs) != 1 || jobs[0].Name != "unit" || jobs[0].Status != "queued" {
119
t.Fatalf("editor-jobs: %v %+v", err, jobs)
120
}
121
if pushDeliveries(t, st, hookID) < pushes+1 {
122
t.Fatal("editor startte geen webhook")
123
}
124
if contribCount(t, st, user.ID, repo.ID) < acts+1 {
125
t.Fatal("editor startte geen activity")
126
}
127
pushes = pushDeliveries(t, st, hookID)
128
acts = contribCount(t, st, user.ID, repo.ID)
129
130
list := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))
131
for _, want := range []string{`data-live-on="1"`, `class="stage-dot pending"`, "Pending"} {
132
if !strings.Contains(list, want) {
133
t.Errorf("lijst mist %q", want)
134
}
135
}
136
home := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))
137
if !strings.Contains(home, `class="status pending"`) || !strings.Contains(home, "Pending") {
138
t.Fatalf("overzicht mist pending:\n%s", home)
139
}
140
css := read(t, mustGet(t, tim, ts.URL+"/assets/style.css"))
141
for _, want := range []string{"@keyframes spin", ".stage-dot.pending .mark", "border-right-color: transparent"} {
142
if !strings.Contains(css, want) {
143
t.Errorf("css mist %q", want)
144
}
145
}
146
147
jobs, err := st.JobsByPipeline(ctx, pipe.ID)
148
if err != nil {
149
t.Fatal(err)
150
}
151
if ok, err := st.MarkJobRunning(ctx, jobs[0].ID); err != nil || !ok {
152
t.Fatalf("running: %v %v", ok, err)
153
}
154
home = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))
155
if !strings.Contains(home, `class="status running"`) || !strings.Contains(home, "Running") {
156
t.Fatalf("overzicht mist running:\n%s", home)
157
}
158
list = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))
159
if !strings.Contains(list, `class="stage-dot running"`) || !strings.Contains(list, `class="status running"`) {
160
t.Fatal("lijst mist het lopende icoon")
161
}
162
163
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/tags")
164
if err != nil {
165
t.Fatal(err)
166
}
167
tags := read(t, res)
168
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/tags", url.Values{
169
"csrf": {csrfOf(t, tags)}, "name": {"v1"}, "target": {"master"}, "message": {"eerste"},
170
})
171
if err != nil {
172
t.Fatal(err)
173
}
174
if page = read(t, res); !strings.Contains(page, "v1") {
175
t.Fatalf("tag:\n%s", page)
176
}
177
tagged := pipelineFor(t, st, repo.ID, master, "refs/tags/v1")
178
if tagged.Status != "queued" {
179
t.Fatalf("tag-pipeline: %+v", tagged)
180
}
181
if pushDeliveries(t, st, hookID) < pushes+1 || contribCount(t, st, user.ID, repo.ID) < acts+1 {
182
t.Fatal("tag mist webhook of activity")
183
}
184
185
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")
186
if err != nil {
187
t.Fatal(err)
188
}
189
editor = read(t, res)
190
featureYML := strings.Replace(receiveYML, "echo ok", "echo feature", 1)
191
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{
192
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"feature"},
193
"message": {"feature yml"}, "body": {featureYML},
194
})
195
if err != nil {
196
t.Fatal(err)
197
}
198
if saved := read(t, res); !strings.Contains(saved, "Committed.") {
199
t.Fatalf("feature:\n%s", saved)
200
}
201
feature := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))
202
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")
203
204
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests")
205
if err != nil {
206
t.Fatal(err)
207
}
208
page = read(t, res)
209
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests", url.Values{
210
"csrf": {csrfOf(t, page)}, "title": {"feature"}, "source": {"feature"}, "target": {"master"},
211
})
212
if err != nil {
213
t.Fatal(err)
214
}
215
page = read(t, res)
216
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/notes", url.Values{
217
"csrf": {csrfOf(t, page)}, "path": {"blue-ci-cd.yml"}, "line_start": {"7"}, "line_end": {"7"},
218
"body": {"```suggestion\n - echo toegepast\n```"},
219
})
220
if err != nil {
221
t.Fatal(err)
222
}
223
page = read(t, res)
224
ids := suggestionIDs(page)
225
if len(ids) != 1 {
226
t.Fatalf("suggestie-ids %v", ids)
227
}
228
beforeFeature := feature
229
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/suggestions", url.Values{
230
"csrf": {csrfOf(t, page)}, "id": {ids[0]}, "title": {"pas de regel aan"},
231
})
232
if err != nil {
233
t.Fatal(err)
234
}
235
if applied := read(t, res); !strings.Contains(applied, "Suggestions applied") {
236
t.Fatalf("suggestie:\n%s", applied)
237
}
238
feature = strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))
239
if feature == beforeFeature {
240
t.Fatal("suggestie maakte geen commit")
241
}
242
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")
243
244
if err := st.UpsertReview(ctx, repo.ID, 1, user.ID, "approved"); err != nil {
245
t.Fatal(err)
246
}
247
passPipelines(t, st, repo.ID)
248
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests/1")
249
if err != nil {
250
t.Fatal(err)
251
}
252
page = read(t, res)
253
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/merge", url.Values{"csrf": {csrfOf(t, page)}})
254
if err != nil {
255
t.Fatal(err)
256
}
257
if merged := read(t, res); !strings.Contains(merged, "Merged") && !strings.Contains(merged, "samengevoegd") && !strings.Contains(merged, "merged") {
258
t.Fatalf("merge:\n%s", merged)
259
}
260
mergedSHA := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))
261
if mergedSHA == master {
262
t.Fatal("merge verschoof master niet")
263
}
264
_ = pipelineFor(t, st, repo.ID, mergedSHA, "refs/heads/master")
265
passPipelines(t, st, repo.ID)
266
267
quiet := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))
268
if strings.Contains(quiet, `data-live-on="1"`) {
269
t.Fatal("afgeronde lijst blijft pollen")
270
}
271
}
272
273
func pipelineCount(t *testing.T, st *store.Store, repoID int64) int {
274
t.Helper()
275
pipes, err := st.ListPipelines(context.Background(), repoID)
276
if err != nil {
277
t.Fatal(err)
278
}
279
return len(pipes)
280
}
281
282
func pipelineFor(t *testing.T, st *store.Store, repoID int64, sha, ref string) store.Pipeline {
283
t.Helper()
284
pipes, err := st.ListPipelines(context.Background(), repoID)
285
if err != nil {
286
t.Fatal(err)
287
}
288
for _, p := range pipes {
289
if p.CommitSHA == sha && p.Ref == ref {
290
return p
291
}
292
}
293
t.Fatalf("geen pipeline voor %s %s in %d stuks", ref, sha, len(pipes))
294
return store.Pipeline{}
295
}
296
297
func pushDeliveries(t *testing.T, st *store.Store, hookID int64) int {
298
t.Helper()
299
rows, err := st.RecentDeliveries(context.Background(), hookID)
300
if err != nil {
301
t.Fatal(err)
302
}
303
n := 0
304
for _, row := range rows {
305
if row.EventType == "push" {
306
n++
307
}
308
}
309
return n
310
}
311
312
func contribCount(t *testing.T, st *store.Store, userID, repoID int64) int {
313
t.Helper()
314
times, err := st.ContributionTimes(context.Background(), userID, []int64{repoID}, time.Unix(0, 0))
315
if err != nil {
316
t.Fatal(err)
317
}
318
return len(times)
319
}
320
321
func passPipelines(t *testing.T, st *store.Store, repoID int64) {
322
t.Helper()
323
ctx := context.Background()
324
pipes, err := st.ListPipelines(ctx, repoID)
325
if err != nil {
326
t.Fatal(err)
327
}
328
for _, p := range pipes {
329
jobs, err := st.JobsByPipeline(ctx, p.ID)
330
if err != nil {
331
t.Fatal(err)
332
}
333
for _, j := range jobs {
334
if j.Status == "success" || j.Status == "failed" || j.Status == "canceled" || j.Status == "skipped" {
335
continue
336
}
337
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
338
t.Fatal(err)
339
}
340
}
341
if _, err := st.RefreshPipelineStatus(ctx, p.ID); err != nil {
342
t.Fatal(err)
343
}
344
}
345
}
@@ -0,0 +1,345 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"net/url"9
"os/exec"10
"path/filepath"11
"strings"12
"testing"13
"time"14
15
"gitlab.com/Timfa/bluegit/internal/auth"16
"gitlab.com/Timfa/bluegit/internal/config"17
"gitlab.com/Timfa/bluegit/internal/gitrepo"18
"gitlab.com/Timfa/bluegit/internal/store"19
)20
21
const receiveYML = "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo ok\n"22
23
func TestPostReceiveStartsPipeline(t *testing.T) {24
if _, err := exec.LookPath("git"); err != nil {25
t.Skip("git ontbreekt")26
}27
storage := t.TempDir()28
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())29
if err != nil {30
t.Fatal(err)31
}32
t.Cleanup(func() { _ = st.Close() })33
cfg := config.Config{34
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,35
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},36
Git: config.Git{Binary: "git", DefaultBranch: "master"},37
CI: config.CI{Enabled: true, Docker: "docker"},38
}39
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}40
ts := httptest.NewServer(srv.Handler())41
t.Cleanup(ts.Close)42
jar, _ := cookiejar.New(nil)43
tim := &http.Client{Jar: jar}44
res, err := tim.Get(ts.URL + "/login")45
if err != nil {46
t.Fatal(err)47
}48
page := read(t, res)49
res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{50
"csrf": {csrfOf(t, page)}, "name": {"ontvangen"}, "visibility": {"public"},51
})52
if err != nil {53
t.Fatal(err)54
}55
page = read(t, res)56
ctx := context.Background()57
repo, err := st.RepoByPath(ctx, "tim", "ontvangen")58
if err != nil {59
t.Fatal(err)60
}61
user, err := st.UserByUsername(ctx, "tim")62
if err != nil {63
t.Fatal(err)64
}65
hookID, err := st.CreateWebhook(ctx, store.Webhook{66
ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",67
URLTemplate: "http://127.0.0.1:9/hook", Events: []string{"push"},68
})69
if err != nil {70
t.Fatal(err)71
}72
res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})73
if err != nil {74
t.Fatal(err)75
}76
token := between(read(t, res), `<p class="code">`, "</p>")77
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/ontvangen.git"78
work := t.TempDir()79
git(t, work, "init", "-b", "master")80
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")81
git(t, work, "config", "user.name", "tim")82
writeFile(t, filepath.Join(work, "README.md"), "hallo\n")83
git(t, work, "add", "README.md")84
git(t, work, "commit", "-m", "leesmij")85
git(t, work, "remote", "add", "origin", remote)86
git(t, work, "push", "-u", "origin", "master")87
88
if n := pipelineCount(t, st, repo.ID); n != 0 {89
t.Fatalf("readme zonder yml startte %d pipelines", n)90
}91
pushes := pushDeliveries(t, st, hookID)92
acts := contribCount(t, st, user.ID, repo.ID)93
if pushes < 1 || acts < 1 {94
t.Fatalf("git push: webhooks %d activity %d", pushes, acts)95
}96
97
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")98
if err != nil {99
t.Fatal(err)100
}101
editor := read(t, res)102
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{103
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"master"},104
"message": {"voeg blue-ci-cd.yml toe"}, "body": {receiveYML},105
})106
if err != nil {107
t.Fatal(err)108
}109
if saved := read(t, res); !strings.Contains(saved, "Committed.") {110
t.Fatalf("editor:\n%s", saved)111
}112
dir := gitrepo.Dir(storage, "tim", "ontvangen")113
master := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))114
pipe := pipelineFor(t, st, repo.ID, master, "refs/heads/master")115
if pipe.Source != "push" || pipe.Status != "queued" {116
t.Fatalf("editor-pipeline: %+v", pipe)117
}118
if jobs, err := st.JobsByPipeline(ctx, pipe.ID); err != nil || len(jobs) != 1 || jobs[0].Name != "unit" || jobs[0].Status != "queued" {119
t.Fatalf("editor-jobs: %v %+v", err, jobs)120
}121
if pushDeliveries(t, st, hookID) < pushes+1 {122
t.Fatal("editor startte geen webhook")123
}124
if contribCount(t, st, user.ID, repo.ID) < acts+1 {125
t.Fatal("editor startte geen activity")126
}127
pushes = pushDeliveries(t, st, hookID)128
acts = contribCount(t, st, user.ID, repo.ID)129
130
list := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))131
for _, want := range []string{`data-live-on="1"`, `class="stage-dot pending"`, "Pending"} {132
if !strings.Contains(list, want) {133
t.Errorf("lijst mist %q", want)134
}135
}136
home := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))137
if !strings.Contains(home, `class="status pending"`) || !strings.Contains(home, "Pending") {138
t.Fatalf("overzicht mist pending:\n%s", home)139
}140
css := read(t, mustGet(t, tim, ts.URL+"/assets/style.css"))141
for _, want := range []string{"@keyframes spin", ".stage-dot.pending .mark", "border-right-color: transparent"} {142
if !strings.Contains(css, want) {143
t.Errorf("css mist %q", want)144
}145
}146
147
jobs, err := st.JobsByPipeline(ctx, pipe.ID)148
if err != nil {149
t.Fatal(err)150
}151
if ok, err := st.MarkJobRunning(ctx, jobs[0].ID); err != nil || !ok {152
t.Fatalf("running: %v %v", ok, err)153
}154
home = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))155
if !strings.Contains(home, `class="status running"`) || !strings.Contains(home, "Running") {156
t.Fatalf("overzicht mist running:\n%s", home)157
}158
list = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))159
if !strings.Contains(list, `class="stage-dot running"`) || !strings.Contains(list, `class="status running"`) {160
t.Fatal("lijst mist het lopende icoon")161
}162
163
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/tags")164
if err != nil {165
t.Fatal(err)166
}167
tags := read(t, res)168
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/tags", url.Values{169
"csrf": {csrfOf(t, tags)}, "name": {"v1"}, "target": {"master"}, "message": {"eerste"},170
})171
if err != nil {172
t.Fatal(err)173
}174
if page = read(t, res); !strings.Contains(page, "v1") {175
t.Fatalf("tag:\n%s", page)176
}177
tagged := pipelineFor(t, st, repo.ID, master, "refs/tags/v1")178
if tagged.Status != "queued" {179
t.Fatalf("tag-pipeline: %+v", tagged)180
}181
if pushDeliveries(t, st, hookID) < pushes+1 || contribCount(t, st, user.ID, repo.ID) < acts+1 {182
t.Fatal("tag mist webhook of activity")183
}184
185
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")186
if err != nil {187
t.Fatal(err)188
}189
editor = read(t, res)190
featureYML := strings.Replace(receiveYML, "echo ok", "echo feature", 1)191
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{192
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"feature"},193
"message": {"feature yml"}, "body": {featureYML},194
})195
if err != nil {196
t.Fatal(err)197
}198
if saved := read(t, res); !strings.Contains(saved, "Committed.") {199
t.Fatalf("feature:\n%s", saved)200
}201
feature := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))202
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")203
204
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests")205
if err != nil {206
t.Fatal(err)207
}208
page = read(t, res)209
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests", url.Values{210
"csrf": {csrfOf(t, page)}, "title": {"feature"}, "source": {"feature"}, "target": {"master"},211
})212
if err != nil {213
t.Fatal(err)214
}215
page = read(t, res)216
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/notes", url.Values{217
"csrf": {csrfOf(t, page)}, "path": {"blue-ci-cd.yml"}, "line_start": {"7"}, "line_end": {"7"},218
"body": {"```suggestion\n - echo toegepast\n```"},219
})220
if err != nil {221
t.Fatal(err)222
}223
page = read(t, res)224
ids := suggestionIDs(page)225
if len(ids) != 1 {226
t.Fatalf("suggestie-ids %v", ids)227
}228
beforeFeature := feature229
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/suggestions", url.Values{230
"csrf": {csrfOf(t, page)}, "id": {ids[0]}, "title": {"pas de regel aan"},231
})232
if err != nil {233
t.Fatal(err)234
}235
if applied := read(t, res); !strings.Contains(applied, "Suggestions applied") {236
t.Fatalf("suggestie:\n%s", applied)237
}238
feature = strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))239
if feature == beforeFeature {240
t.Fatal("suggestie maakte geen commit")241
}242
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")243
244
if err := st.UpsertReview(ctx, repo.ID, 1, user.ID, "approved"); err != nil {245
t.Fatal(err)246
}247
passPipelines(t, st, repo.ID)248
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests/1")249
if err != nil {250
t.Fatal(err)251
}252
page = read(t, res)253
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/merge", url.Values{"csrf": {csrfOf(t, page)}})254
if err != nil {255
t.Fatal(err)256
}257
if merged := read(t, res); !strings.Contains(merged, "Merged") && !strings.Contains(merged, "samengevoegd") && !strings.Contains(merged, "merged") {258
t.Fatalf("merge:\n%s", merged)259
}260
mergedSHA := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))261
if mergedSHA == master {262
t.Fatal("merge verschoof master niet")263
}264
_ = pipelineFor(t, st, repo.ID, mergedSHA, "refs/heads/master")265
passPipelines(t, st, repo.ID)266
267
quiet := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))268
if strings.Contains(quiet, `data-live-on="1"`) {269
t.Fatal("afgeronde lijst blijft pollen")270
}271
}272
273
func pipelineCount(t *testing.T, st *store.Store, repoID int64) int {274
t.Helper()275
pipes, err := st.ListPipelines(context.Background(), repoID)276
if err != nil {277
t.Fatal(err)278
}279
return len(pipes)280
}281
282
func pipelineFor(t *testing.T, st *store.Store, repoID int64, sha, ref string) store.Pipeline {283
t.Helper()284
pipes, err := st.ListPipelines(context.Background(), repoID)285
if err != nil {286
t.Fatal(err)287
}288
for _, p := range pipes {289
if p.CommitSHA == sha && p.Ref == ref {290
return p291
}292
}293
t.Fatalf("geen pipeline voor %s %s in %d stuks", ref, sha, len(pipes))294
return store.Pipeline{}295
}296
297
func pushDeliveries(t *testing.T, st *store.Store, hookID int64) int {298
t.Helper()299
rows, err := st.RecentDeliveries(context.Background(), hookID)300
if err != nil {301
t.Fatal(err)302
}303
n := 0304
for _, row := range rows {305
if row.EventType == "push" {306
n++307
}308
}309
return n310
}311
312
func contribCount(t *testing.T, st *store.Store, userID, repoID int64) int {313
t.Helper()314
times, err := st.ContributionTimes(context.Background(), userID, []int64{repoID}, time.Unix(0, 0))315
if err != nil {316
t.Fatal(err)317
}318
return len(times)319
}320
321
func passPipelines(t *testing.T, st *store.Store, repoID int64) {322
t.Helper()323
ctx := context.Background()324
pipes, err := st.ListPipelines(ctx, repoID)325
if err != nil {326
t.Fatal(err)327
}328
for _, p := range pipes {329
jobs, err := st.JobsByPipeline(ctx, p.ID)330
if err != nil {331
t.Fatal(err)332
}333
for _, j := range jobs {334
if j.Status == "success" || j.Status == "failed" || j.Status == "canceled" || j.Status == "skipped" {335
continue336
}337
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {338
t.Fatal(err)339
}340
}341
if _, err := st.RefreshPipelineStatus(ctx, p.ID); err != nil {342
t.Fatal(err)343
}344
}345
}@@ -328,7 +328,6 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
328
328
return
329
329
}
330
330
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
331
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
332
331
work, err := s.scratchDir("merge")
333
332
if err != nil {
334
333
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
@@ -337,13 +336,13 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
337
336
defer os.RemoveAll(work)
338
337
email := u.Username + "@users.git.timfalken.com"
339
338
msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
340
if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
339
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
340
return gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns)
341
}); err != nil {
341
342
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
342
343
return
343
344
}
344
345
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
345
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
346
s.AfterPush(repo, u, before, after)
347
346
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
348
347
}
349
348
@@ -328,7 +328,6 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {328
return328
return329
}329
}330
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)330
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)331
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)332
work, err := s.scratchDir("merge")331
work, err := s.scratchDir("merge")333
if err != nil {332
if err != nil {334
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))333
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))@@ -337,13 +336,13 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {337
defer os.RemoveAll(work)336
defer os.RemoveAll(work)338
email := u.Username + "@users.git.timfalken.com"337
email := u.Username + "@users.git.timfalken.com"339
msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"338
msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"340
if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {339
if err := s.postReceive(r.Context(), repo, u, dir, func() error {340
return gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns)341
}); err != nil {341
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))342
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))342
return343
return343
}344
}344
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")345
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")345
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)346
s.AfterPush(repo, u, before, after)347
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")346
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")348
}347
}349
348
@@ -591,6 +591,8 @@ type CodeLine struct {
591
591
type CommitRow struct {
592
592
SHA, Short, Author, Date, Subject, Body, When string
593
593
UserURL, Avatar, Initial, RawName, PushedBy string
594
PipeID int64
595
PipeStatus, PipeLabel string
594
596
}
595
597
596
598
// EntryRow is een bestand of map.
@@ -591,6 +591,8 @@ type CodeLine struct {591
type CommitRow struct {591
type CommitRow struct {592
SHA, Short, Author, Date, Subject, Body, When string592
SHA, Short, Author, Date, Subject, Body, When string593
UserURL, Avatar, Initial, RawName, PushedBy string593
UserURL, Avatar, Initial, RawName, PushedBy string594
PipeID int64595
PipeStatus, PipeLabel string594
}596
}595
597
596
// EntryRow is een bestand of map.598
// EntryRow is een bestand of map.@@ -464,10 +464,22 @@ svg.ico { width: 14px; height: 14px; flex: none; }
464
464
.skipped .mark::after, .canceled .mark::after {
465
465
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;
466
466
}
467
.status.pending .mark, .status.created .mark,
468
.stage-dot.pending .mark, .stage-dot.created .mark {
469
background: transparent;
470
box-shadow: inset 0 0 0 2px #8c959f;
471
}
467
472
.running .mark::after {
468
content: ""; position: absolute; left: 4px; top: 4px; width: 8px; height: 8px;
473
content: ""; position: absolute; left: 3px; top: 3px; width: 10px; height: 10px;
469
474
border: 2px solid #fff; border-radius: 50%; border-right-color: transparent; box-sizing: border-box;
475
animation: spin 0.8s linear infinite;
476
}
477
.stage-dot.sm.running .mark::after { left: 2px; top: 2px; width: 8px; height: 8px; }
478
@keyframes spin { to { transform: rotate(1turn); } }
479
@media (prefers-reduced-motion: reduce) {
480
.running .mark::after { animation: none; }
470
481
}
482
.commitbar a.status { flex: none; text-decoration: none; }
471
483
.stages { display: flex; align-items: center; }
472
484
.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }
473
485
.danger-modal {
@@ -464,10 +464,22 @@ svg.ico { width: 14px; height: 14px; flex: none; }464
.skipped .mark::after, .canceled .mark::after {464
.skipped .mark::after, .canceled .mark::after {465
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;465
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;466
}466
}467
.status.pending .mark, .status.created .mark,468
.stage-dot.pending .mark, .stage-dot.created .mark {469
background: transparent;470
box-shadow: inset 0 0 0 2px #8c959f;471
}467
.running .mark::after {472
.running .mark::after {468
content: ""; position: absolute; left: 4px; top: 4px; width: 8px; height: 8px;473
content: ""; position: absolute; left: 3px; top: 3px; width: 10px; height: 10px;469
border: 2px solid #fff; border-radius: 50%; border-right-color: transparent; box-sizing: border-box;474
border: 2px solid #fff; border-radius: 50%; border-right-color: transparent; box-sizing: border-box;475
animation: spin 0.8s linear infinite;476
}477
.stage-dot.sm.running .mark::after { left: 2px; top: 2px; width: 8px; height: 8px; }478
@keyframes spin { to { transform: rotate(1turn); } }479
@media (prefers-reduced-motion: reduce) {480
.running .mark::after { animation: none; }470
}481
}482
.commitbar a.status { flex: none; text-decoration: none; }471
.stages { display: flex; align-items: center; }483
.stages { display: flex; align-items: center; }472
.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }484
.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }473
.danger-modal {485
.danger-modal {@@ -143,7 +143,6 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
143
143
s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
144
144
return
145
145
}
146
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
147
146
work, err := s.scratchDir("suggest")
148
147
if err != nil {
149
148
s.redirect(w, r, back, "", s.commitProblem(r, err))
@@ -151,11 +150,11 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
151
150
}
152
151
defer os.RemoveAll(work)
153
152
email := u.Username + "@users.git.timfalken.com"
154
if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
153
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
154
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns)
155
}); err != nil {
155
156
s.redirect(w, r, back, "", s.commitProblem(r, err))
156
157
return
157
158
}
158
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
159
s.AfterPush(repo, u, before, after)
160
159
s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
161
160
}
@@ -143,7 +143,6 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {143
s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))143
s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))144
return144
return145
}145
}146
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)147
work, err := s.scratchDir("suggest")146
work, err := s.scratchDir("suggest")148
if err != nil {147
if err != nil {149
s.redirect(w, r, back, "", s.commitProblem(r, err))148
s.redirect(w, r, back, "", s.commitProblem(r, err))@@ -151,11 +150,11 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {151
}150
}152
defer os.RemoveAll(work)151
defer os.RemoveAll(work)153
email := u.Username + "@users.git.timfalken.com"152
email := u.Username + "@users.git.timfalken.com"154
if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {153
if err := s.postReceive(r.Context(), repo, u, dir, func() error {154
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns)155
}); err != nil {155
s.redirect(w, r, back, "", s.commitProblem(r, err))156
s.redirect(w, r, back, "", s.commitProblem(r, err))156
return157
return157
}158
}158
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)159
s.AfterPush(repo, u, before, after)160
s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")159
s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")161
}160
}@@ -81,7 +81,9 @@ func (s *Server) createTag(w http.ResponseWriter, r *http.Request) {
81
81
target = repo.DefaultBranch
82
82
}
83
83
email := u.Username + "@users.git.timfalken.com"
84
if err := gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email); err != nil {
84
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
85
return gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email)
86
}); err != nil {
85
87
s.redirect(w, r, back, "", s.trErr(r, err))
86
88
return
87
89
}
@@ -81,7 +81,9 @@ func (s *Server) createTag(w http.ResponseWriter, r *http.Request) {81
target = repo.DefaultBranch81
target = repo.DefaultBranch82
}82
}83
email := u.Username + "@users.git.timfalken.com"83
email := u.Username + "@users.git.timfalken.com"84
if err := gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email); err != nil {84
if err := s.postReceive(r.Context(), repo, u, dir, func() error {85
return gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email)86
}); err != nil {85
s.redirect(w, r, back, "", s.trErr(r, err))87
s.redirect(w, r, back, "", s.trErr(r, err))86
return88
return87
}89
}@@ -250,6 +250,7 @@
250
250
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>
251
251
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>
252
252
</div>
253
{{if .Head.PipeStatus}}<a class="status {{.Head.PipeStatus}}" href="/{{.Repo.FullPath}}/-/pipelines/{{.Head.PipeID}}"><span class="mark"></span>{{.Head.PipeLabel}}</a>{{end}}
253
254
<code class="sha">{{slice .Head.SHA 0 8}}</code>
254
255
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>
255
256
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>
@@ -250,6 +250,7 @@250
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>250
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>251
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>251
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>252
</div>252
</div>253
{{if .Head.PipeStatus}}<a class="status {{.Head.PipeStatus}}" href="/{{.Repo.FullPath}}/-/pipelines/{{.Head.PipeID}}"><span class="mark"></span>{{.Head.PipeLabel}}</a>{{end}}253
<code class="sha">{{slice .Head.SHA 0 8}}</code>254
<code class="sha">{{slice .Head.SHA 0 8}}</code>254
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>255
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>255
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>256
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>@@ -527,6 +527,15 @@ type scanner interface {
527
527
Scan(dest ...any) error
528
528
}
529
529
530
// LatestPipelineByCommit geeft de nieuwste pipeline van deze commit.
531
func (s *Store) LatestPipelineByCommit(ctx context.Context, repoID int64, sha string) (Pipeline, error) {
532
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND commit_sha = ? ORDER BY id DESC LIMIT 1`, repoID, sha))
533
if errors.Is(err, sql.ErrNoRows) {
534
return Pipeline{}, errNotFound
535
}
536
return p, err
537
}
538
530
539
// PipelineByID leest één pipeline.
531
540
func (s *Store) PipelineByID(ctx context.Context, repoID, id int64) (Pipeline, error) {
532
541
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND id = ?`, repoID, id))
@@ -527,6 +527,15 @@ type scanner interface {527
Scan(dest ...any) error527
Scan(dest ...any) error528
}528
}529
529
530
// LatestPipelineByCommit geeft de nieuwste pipeline van deze commit.531
func (s *Store) LatestPipelineByCommit(ctx context.Context, repoID int64, sha string) (Pipeline, error) {532
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND commit_sha = ? ORDER BY id DESC LIMIT 1`, repoID, sha))533
if errors.Is(err, sql.ErrNoRows) {534
return Pipeline{}, errNotFound535
}536
return p, err537
}538
530
// PipelineByID leest één pipeline.539
// PipelineByID leest één pipeline.531
func (s *Store) PipelineByID(ctx context.Context, repoID, id int64) (Pipeline, error) {540
func (s *Store) PipelineByID(ctx context.Context, repoID, id int64) (Pipeline, error) {532
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND id = ?`, repoID, id))541
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND id = ?`, repoID, id))