Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set pre-step status to skipped if job is skipped #29489

Merged
merged 11 commits into from
Mar 1, 2024
Merged

Set pre-step status to skipped if job is skipped #29489

merged 11 commits into from
Mar 1, 2024

Conversation

sillyguodong
Copy link
Contributor

@sillyguodong sillyguodong commented Feb 29, 2024 •
edited

close #27496

  1. Set pre-step (Set up job) status to skipped if job is skipped.
  2. Apart from pre-step, the other steps should also be set to skipped. The status of other steps are reported from the runner side. This will be completed by this PR: https://gitea.com/gitea/act_runner/pulls/500

before:
image

after:
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 29, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 29, 2024
@sillyguodong sillyguodong added the topic/gitea-actions related to the actions of Gitea label Feb 29, 2024
@lunny lunny added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Feb 29, 2024
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 29, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 29, 2024
@pull-request-size pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 29, 2024
@sillyguodong sillyguodong changed the title Set pre-step status to cancelled if job is skipped Set pre-step status to skipped if job is skipped Feb 29, 2024
@GiteaBot 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 Feb 29, 2024
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 29, 2024
lunny
lunny requested changes Feb 29, 2024
View reviewed changes
Copy link
Member

@lunny lunny left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's right. skipped should be considered as success but canceled should be considered as failure. I don't understand why the frontend code changed.

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Feb 29, 2024
@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 29, 2024
@sillyguodong
Copy link
Contributor Author

sillyguodong commented Mar 1, 2024 •
edited

I don't think it's right. skipped should be considered as success but canceled should be considered as failure.

@lunny Got it. In this PR, just set pre-setp status to skipped if the job is skipped now and don't change frontend.
On runner side, the reported status of the job's steps should also be skipped. I created a PR in act_runner's repository that implements it.
Could you take a look.

@sillyguodong sillyguodong requested a review from lunny March 1, 2024 06:40
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels Mar 1, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 1, 2024
@lunny lunny enabled auto-merge (squash) March 1, 2024 08:04
@wxiaoguang wxiaoguang removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 1, 2024
@GiteaBot 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 Mar 1, 2024
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 1, 2024
@lunny lunny merged commit cee08f6 into go-gitea:main Mar 1, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Mar 1, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 1, 2024
@sillyguodong @GiteaBot
Set pre-step status to skipped if job is skipped (go-gitea#29489)
84a064a 
close go-gitea#27496
1. Set pre-step (Set up job) status to `skipped` if job is skipped.
2. Apart from pre-step, the other steps should also be set to `skipped`.
The status of other steps are reported from the runner side. This will
be completed by this PR: https://gitea.com/gitea/act_runner/pulls/500

before:

![image](https://github.com/go-gitea/gitea/assets/33891828/4bac2ba9-66de-4679-b7ed-fbae459c0c54)

after:

![image](https://github.com/go-gitea/gitea/assets/33891828/ead4871a-4e0f-4bb1-9fb4-37f4fdb78dfc)
@GiteaBot GiteaBot mentioned this pull request Mar 1, 2024
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 1, 2024
silverwind pushed a commit that referenced this pull request Mar 1, 2024
@GiteaBot @sillyguodong
Set pre-step status to skipped if job is skipped (#29489) (#29523)
8d08558 
Backport #29489 by @sillyguodong

close #27496
1. Set pre-step (Set up job) status to `skipped` if job is skipped.
2. Apart from pre-step, the other steps should also be set to `skipped`.
The status of other steps are reported from the runner side. This will
be completed by this PR: https://gitea.com/gitea/act_runner/pulls/500

before:

![image](https://github.com/go-gitea/gitea/assets/33891828/4bac2ba9-66de-4679-b7ed-fbae459c0c54)

after:

![image](https://github.com/go-gitea/gitea/assets/33891828/ead4871a-4e0f-4bb1-9fb4-37f4fdb78dfc)

Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 1, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
2095f08 
* giteaofficial/main:
  Set pre-step status to `skipped` if job is skipped (go-gitea#29489)
  Use a predictiable fork URL to allow forking repositories without providing a repo ID (go-gitea#29519)
  Adding back missing options to app.example.ini (go-gitea#29511)
  Refactor the "attachments" sub-template data key to RenderedContent (go-gitea#29517)
  Rename Str2html to SanitizeHTML and clarify its behavior (go-gitea#29516)
  Add admin API route for managing user's badges (go-gitea#23106)
  Refactor some Str2html code (go-gitea#29397)
  Move migration functions to services layer (go-gitea#29497)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 10, 2024
@sillyguodong sillyguodong deleted the fix/action_task_step_status branch March 14, 2024 06:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

@delvh delvh Awaiting requested review from delvh

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. topic/gitea-actions related to the actions of Gitea type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Actions skip step icon display error
7 participants
@sillyguodong @lunny @silverwind @delvh @wxiaoguang @yardenshoham @GiteaBot