Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
d6a95ce
support concurrency
Zettat123 Dec 7, 2024
f713c68
Merge branch 'main' of https://github.com/go-gitea/gitea into pr/Zett…
ChristopherHX Jul 8, 2025
76f58ef
fix: lint
ChristopherHX Jul 8, 2025
249e315
fix: assert correct status code
ChristopherHX Jul 8, 2025
b012126
fix: rerun all jobs did not respect concurrency
ChristopherHX Jul 9, 2025
91fccb7
Fix and Test rerun single jobs
ChristopherHX Jul 9, 2025
2e6032a
Remove CancelJobsByJobConcurrency in PickTask
ChristopherHX Jul 13, 2025
1a08b87
Merge branch 'main' of https://github.com/go-gitea/gitea into pr/Zett…
ChristopherHX Jul 13, 2025
9bba25e
remove code
ChristopherHX Jul 15, 2025
e6d25e2
Merge branch 'main' of https://github.com/go-gitea/gitea into pr/Zett…
ChristopherHX Jul 15, 2025
dc86086
call EmitJobsIfReady when cancelling a run
Zettat123 Jul 19, 2025
8721155
add TestCancelConcurrentRun
Zettat123 Jul 19, 2025
c5444e7
improve concurrency index
Zettat123 Jul 21, 2025
63eaf15
modify cancel-in-progress behavior
Zettat123 Jul 22, 2025
96d6938
fix bugs and tests
Zettat123 Jul 22, 2025
ea2bc92
Merge branch 'main' into support-actions-concurrency
Zettat123 Jul 22, 2025
a4b76b6
update InsertRun
Zettat123 Jul 22, 2025
ca18672
modify cancel-in-progress behavior
Zettat123 Jul 23, 2025
dc003e4
fix lint
Zettat123 Jul 23, 2025
e45ca56
improve handling cancellation
Zettat123 Jul 25, 2025
5e2059a
rename migration
Zettat123 Jul 25, 2025
4ba788d
Merge branch 'main' into support-actions-concurrency
Zettat123 Jul 25, 2025
2481e83
fix migration
Zettat123 Jul 25, 2025
f585f90
remove blockRunByConcurrency todo for jobs
ChristopherHX Jul 25, 2025
5e43aa2
fix migration to use same index as model
ChristopherHX Jul 25, 2025
d5f6c44
implement evaluate concurrency expression again, vars may change afte…
ChristopherHX Jul 25, 2025
796d2c1
Use a single RawConcurrency in db
ChristopherHX Jul 25, 2025
6a9eb9e
fix fmt
ChristopherHX Jul 25, 2025
42c2ca2
add TestAbandonConcurrentRun
Zettat123 Jul 25, 2025
5a45b76
update to act dev version add new tests
ChristopherHX Jul 29, 2025
989e274
Merge branch 'main' into support-actions-concurrency
Zettat123 Oct 3, 2025
15cc5c5
resolve conflicts
Zettat123 Oct 3, 2025
defa2fd
fix status update
Zettat123 Oct 3, 2025
7d5c377
Merge branch 'main' into support-actions-concurrency
Zettat123 Oct 5, 2025
ffe50aa
Merge branch 'main' into support-actions-concurrency
Zettat123 Oct 6, 2025
63d9a56
resolve conflicts
Zettat123 Oct 6, 2025
2dbede9
add 'IgnoreDropIndices' option to migration
Zettat123 Oct 6, 2025
8356dbe
only keep new index
Zettat123 Oct 6, 2025
ffe9597
fix comments
Zettat123 Oct 7, 2025
9a70f52
Merge branch 'main' into support-actions-concurrency
Zettat123 Oct 7, 2025
7b30080
skip chanaged jobs when cancelling jobs
Zettat123 Oct 7, 2025
c652810
add more comments and fix ErrUnevaluatedConcurrency
Zettat123 Oct 8, 2025
15c504c
fix rerun job and update test
Zettat123 Oct 9, 2025
3b4ad5d
remove ErrUnevaluatedConcurrency
wxiaoguang Oct 9, 2025
ae81158
fix comment
wxiaoguang Oct 9, 2025
d91ec9b
update comments
wxiaoguang Oct 9, 2025
87d7f65
fix comment
wxiaoguang Oct 9, 2025
84d6254
fix comment
Zettat123 Oct 10, 2025
bb399e6
fix lint
Zettat123 Oct 10, 2025
90a31d0
refactor
wxiaoguang Oct 10, 2025
d7dcd8b
fine tune
wxiaoguang Oct 10, 2025
23c80cf
fix lint
wxiaoguang Oct 10, 2025
2ad1e67
fix
wxiaoguang Oct 10, 2025
02dc4fa
fix
wxiaoguang Oct 10, 2025
023e6e2
use shouldBlock instead of status checking
wxiaoguang Oct 10, 2025
e38d886
fix test
wxiaoguang Oct 10, 2025
4f5143f
fix prepare
wxiaoguang Oct 10, 2025
2383132
rename variable
wxiaoguang Oct 10, 2025
6d12149
fix
wxiaoguang Oct 10, 2025
d69d345
fine tune comment and func name
wxiaoguang Oct 10, 2025
dc1faf9
Merge branch 'main' into support-actions-concurrency
wxiaoguang Oct 10, 2025
aa419a5
Merge branch 'main' into support-actions-concurrency
GiteaBot Oct 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions routers/web/repo/actions/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,14 @@ func Cancel(ctx *context_module.Context) {

actions_service.CreateCommitStatus(ctx, jobs...)

run, err := actions_model.GetRunByIndex(ctx, ctx.Repo.Repository.ID, runIndex)
if err != nil {
ctx.ServerError("GetRunByIndex", err)
}
if err := actions_service.EmitJobsIfReady(run.ID); err != nil {
log.Error("Emit ready jobs of run %d: %v", run.ID, err)
}

for _, job := range updatedjobs {
_ = job.LoadAttributes(ctx)
notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
Expand Down