Implement auto-cancellation of concurrent jobs if the event is push by appleboy · Pull Request #25716 · go-gitea/gitea

appleboy · 2023-07-06T03:37:32Z

cancel running jobs if the event is push
Add a new function CancelRunningJobs to cancel all running jobs of a run
Update FindRunOptions struct to include Ref field and update its condition in toConds function
Implement auto cancellation of running jobs in the same workflow in notify function

related task: #22751

- Add a new function `CancelRunningJobs` to cancel all running jobs of a run - Update `FindRunOptions` struct to include `Ref` field and update its condition in `toConds` function - Implement auto cancellation of running jobs in the same workflow in `notify` function Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

- Change the `Status` field in `CancelRunningJobs`, `FindRunOptions`, and `List` functions from a single `Status` to a slice of `Status`. - Update the condition in `toConds` function to check the length of `Status` slice instead of comparing a single `Status` value with `StatusUnknown`. - Modify the condition to use `builder.In` for matching multiple `Status` values instead of `builder.Eq` for a single `Status` value. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

wolfogre · 2023-07-06T10:10:01Z

 		}
+
+		// auto cancel running jobs in the same workflow
+		if err := actions_model.CancelRunningJobs(ctx, run); err != nil {


So it will cancel the previous jobs of the same ref by default, I'm OK with this, and we can provide an options later if someone ask for it.

@wolfogre Yes, move to another NEW PR.

- Add an index to the `Ref` field in the `ActionRun` struct - Modify the `CancelRunningJobs` function to use `total` instead of `len(runs)` for checking if there are no runs. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

- Remove the code that sets the status of a run to cancelled and updates the run in `CancelRunningJobs` function. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

wolfogre · 2023-07-07T06:28:30Z

~~Please wait for #25743~~

Done

Co-authored-by: Jason Song <i@wolfogre.com>

wolfogre · 2023-07-13T02:02:29Z

Please check #25716 (comment)

…ame` - Add `WorkflowID` to the `CancelRunningJobs` function in `run.go` - Replace `WorkflowFileName` with `WorkflowID` in `FindRunOptions` struct in `run_list.go` - Update conditions in `toConds` function to use `WorkflowID` instead of `WorkflowFileName` in `run_list.go` - Replace `WorkflowFileName` with `WorkflowID` in `List` function in `actions.go` Signed-off-by: appleboy <appleboy.tw@gmail.com>

- Modify the comment for the `CancelRunningJobs` function to specify that it also marks unstarted jobs as cancelled - Change the comment in `notify` function to specify that running jobs are cancelled only if the event is a push - Add a condition in `notify` function to cancel running jobs of the same workflow only if the event is a push Signed-off-by: appleboy <appleboy.tw@gmail.com>

- Update the `CancelRunningJobs` function to cancel all running and waiting jobs associated with a specific workflow - Modify the function parameters to include `repoID`, `ref`, and `workflowID` - Add checks and conditions to handle different job states during cancellation - Update the call to `CancelRunningJobs` in `notifier_helper.go` to match the new function signature Signed-off-by: appleboy <appleboy.tw@gmail.com>

- Refactor the `CancelRunningJobs` function parameters for better readability. Signed-off-by: appleboy <appleboy.tw@gmail.com>

- Add a new migration "Update Action Ref" to the migrations list - Create a new file `v267.go` in `models/migrations/v1_21` directory - Define a new function `UpdateActionsRefIndex` in `v267.go` to update the index of actions ref field - The `UpdateActionsRefIndex` function syncs a new instance of `ActionRun` struct which includes fields like `ID`, `Title`, `RepoID`, `OwnerID`, `WorkflowID`, `Index`, `TriggerUserID`, `Ref`, `CommitSHA`, `IsForkPullRequest`, `NeedApproval`, `ApprovedBy`, `Event`, `EventPayload`, `TriggerEvent`, `Status`, `Started`, `Stopped`, `Created`, `Updated`. Signed-off-by: appleboy <appleboy.tw@gmail.com>

appleboy · 2023-07-23T12:07:32Z

@wolfogre Please help to review.

GiteaBot · 2023-07-24T06:11:39Z

@appleboy please fix the merge conflicts. 🍵

Co-authored-by: delvh <dev.lh@web.de>

- Update migration version from `v267` to `v269` - Rename migration file from `v267.go` to `v268.go` Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* giteaofficial/main: (23 commits) Avoid writing config file if not installed (go-gitea#26107) Implement auto-cancellation of concurrent jobs if the event is push (go-gitea#25716) [skip ci] Updated translations via Crowdin doc guide the user to create the appropriate level runner (go-gitea#26091) Fix handling of Debian files with trailing slash (go-gitea#26087) fix Missing 404 swagger response docs for /admin/users/{username} (go-gitea#26086) Allow the use of alternative net.Listener implementations by downstreams (go-gitea#25855) Add missing default value for some Bool cli flags (go-gitea#26082) Reduce unnecessary DB queries for Actions tasks (go-gitea#25199) Use stderr as fallback if the log file can't be opened (go-gitea#26074) Make organization redirect warning more clear (go-gitea#26077) Replace gogs/cron with go-co-op/gocron (go-gitea#25977) Remove `db.DefaultContext` in `routers/` and `cmd/` (go-gitea#26076) Categorize admin settings sidebar panel (go-gitea#26030) [skip ci] Updated translations via Crowdin Fix duplicated url prefix on issue context menu (go-gitea#26066) Add context parameter to some database functions (go-gitea#26055) Fix branch list auth (go-gitea#26041) Fix the truncate and alignment problem for some admin tables (go-gitea#26042) Update secrets.en-us.md (go-gitea#26057) ...

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 6, 2023

pull-request-size Bot added the size/M label Jul 6, 2023

wolfogre reviewed Jul 6, 2023

View reviewed changes

appleboy added 3 commits July 7, 2023 08:41

refactor: optimize job cancellation and action run indexing

f066eb0

- Add an index to the `Ref` field in the `ActionRun` struct - Modify the `CancelRunningJobs` function to use `total` instead of `len(runs)` for checking if there are no runs. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

refactor: refactor job cancellation process

b64ed17

- Remove the code that sets the status of a run to cancelled and updates the run in `CancelRunningJobs` function. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

Merge branch 'main' into cancel

e318f28

appleboy added 2 commits July 8, 2023 06:38

Merge branch 'main' into cancel

251be01

Merge branch 'main' into cancel

edeb7af

wolfogre reviewed Jul 10, 2023

View reviewed changes

Comment thread models/actions/run.go Outdated

appleboy and others added 3 commits July 12, 2023 14:52

Update models/actions/run.go

2db7378

Co-authored-by: Jason Song <i@wolfogre.com>

Merge branch 'main' into cancel

f383d9e

Merge branch 'main' into cancel

1b16a52

lunny added this to the 1.21.0 milestone Jul 21, 2023

lunny added type/feature Completely new functionality. Can only be merged if feature freeze is not active. topic/gitea-actions related to the actions of Gitea labels Jul 21, 2023

appleboy added 2 commits July 21, 2023 21:02

wolfogre reviewed Jul 21, 2023

View reviewed changes

Comment thread models/actions/run.go Outdated

pull-request-size Bot added size/L and removed size/M labels Jul 21, 2023

appleboy added 3 commits July 21, 2023 21:16

Merge branch 'main' into cancel

6b6b17c

refactor: improve code readability and test robustness

231e237

- Refactor the `CancelRunningJobs` function parameters for better readability. Signed-off-by: appleboy <appleboy.tw@gmail.com>

appleboy changed the title ~~feat: implement auto-cancellation of concurrent jobs~~ feat: implement auto-cancellation of concurrent jobs if the event is push Jul 21, 2023

lunny approved these changes Jul 21, 2023

View reviewed changes

lunny reviewed Jul 22, 2023

View reviewed changes

Comment thread services/actions/notifier_helper.go

Merge branch 'main' into cancel

b0ab570

wolfogre reviewed Jul 24, 2023

View reviewed changes

Comment thread models/migrations/v1_21/v267.go Outdated

Comment thread models/migrations/v1_21/v267.go Outdated

Apply suggestions from code review

d7b577f

wolfogre approved these changes Jul 24, 2023

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 24, 2023

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 24, 2023

Merge branch 'main' into cancel

1af0878

lunny enabled auto-merge (squash) July 24, 2023 05:52

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 24, 2023

delvh reviewed Jul 24, 2023

View reviewed changes

Comment thread models/migrations/v1_21/v267.go Outdated

Comment thread services/actions/notifier_helper.go

Comment thread models/actions/run_list.go Outdated

Comment thread models/actions/run.go Outdated

auto-merge was automatically disabled July 24, 2023 23:23
Head branch was pushed to by a user without write access

appleboy and others added 3 commits July 25, 2023 07:23

Update models/actions/run.go

e767742

Co-authored-by: delvh <dev.lh@web.de>

Update models/actions/run_list.go

9ab6ec4

Co-authored-by: delvh <dev.lh@web.de>

Update models/migrations/v1_21/v267.go

d649e95

Co-authored-by: delvh <dev.lh@web.de>

wolfogre reviewed Jul 25, 2023

View reviewed changes

Comment thread services/actions/notifier_helper.go Outdated

wolfogre and others added 3 commits July 25, 2023 10:07

Update services/actions/notifier_helper.go

face538

chore: update migration version and rename file

8a05c67

- Update migration version from `v267` to `v269` - Rename migration file from `v267.go` to `v268.go` Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

Merge branch 'main' into cancel

a79384d

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 25, 2023

wolfogre changed the title ~~feat: implement auto-cancellation of concurrent jobs if the event is push~~ Implement auto-cancellation of concurrent jobs if the event is push Jul 25, 2023

wolfogre merged commit 44781f9 into go-gitea:main Jul 25, 2023

appleboy deleted the cancel branch July 25, 2023 03:16

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 25, 2023

lunny mentioned this pull request Jul 25, 2023

WIP: chore(actions): support cron schedule task #22751

Closed

go-gitea locked as resolved and limited conversation to collaborators Oct 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Implement auto-cancellation of concurrent jobs if the event is push#25716

Implement auto-cancellation of concurrent jobs if the event is push#25716
wolfogre merged 28 commits into
go-gitea:mainfrom
appleboy:cancel

appleboy commented Jul 6, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

wolfogre Jul 6, 2023 •

edited

Loading

Uh oh!

appleboy Jul 7, 2023

Uh oh!

wolfogre commented Jul 7, 2023 •

edited

Loading

Uh oh!

Uh oh!

wolfogre commented Jul 13, 2023

Uh oh!

Uh oh!

Uh oh!

appleboy commented Jul 23, 2023

Uh oh!

Uh oh!

Uh oh!

GiteaBot commented Jul 24, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

appleboy commented Jul 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wolfogre Jul 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

appleboy Jul 7, 2023

Choose a reason for hiding this comment

Uh oh!

wolfogre commented Jul 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

wolfogre commented Jul 13, 2023

Uh oh!

Uh oh!

Uh oh!

appleboy commented Jul 23, 2023

Uh oh!

Uh oh!

Uh oh!

GiteaBot commented Jul 24, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

appleboy commented Jul 6, 2023 •

edited

Loading

wolfogre Jul 6, 2023 •

edited

Loading

wolfogre commented Jul 7, 2023 •

edited

Loading