Skip to content

Conversation

sillyguodong
Copy link
Contributor

@sillyguodong sillyguodong commented Feb 29, 2024

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
@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
@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
@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
Copy link
Member

@lunny lunny left a comment

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

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
@sillyguodong sillyguodong requested review from delvh and silverwind 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
@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
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 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
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 <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 1, 2024
* 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.
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. topic/gitea-actions related to the actions of Gitea type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Actions skip step icon display error
7 participants