Skip to content
New issue

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

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

Already on GitHub? # to your account

Avoid running action when action unit is disabled after workflows detected #30331

Merged
merged 2 commits into from
Apr 8, 2024

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Apr 8, 2024

Fix #30243

We only checking unit disabled when detecting workflows, but not in runner FetchTask.
So if a workflow was detected when action unit is enabled, but disabled later, FetchTask will still return these detected actions.

Global setting: repo.ENABLED and repository.DISABLED_REPO_UNITS will not effect this.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 8, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 8, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Apr 8, 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 Apr 8, 2024
@lunny lunny requested a review from wolfogre April 8, 2024 06:54
@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Apr 8, 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 Apr 8, 2024
@yp05327
Copy link
Contributor Author

yp05327 commented Apr 8, 2024

maybe we need a test for this, but it is using RunnerServiceClient which seems can not run in test?

@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 8, 2024
@lunny lunny merged commit d872ce0 into go-gitea:main Apr 8, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 8, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 8, 2024
…ected (go-gitea#30331)

Fix go-gitea#30243

We only checking unit disabled when detecting workflows, but not in
runner `FetchTask`.
So if a workflow was detected when action unit is enabled, but disabled
later, `FetchTask` will still return these detected actions.

Global setting: repo.ENABLED and repository.`DISABLED_REPO_UNITS` will
not effect this.
@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 Apr 8, 2024
@lunny lunny added the backport/v1.21 This PR should be backported to Gitea 1.21 label Apr 8, 2024
silverwind pushed a commit that referenced this pull request Apr 8, 2024
…ected (#30331) (#30338)

Backport #30331 by @yp05327

Fix #30243

We only checking unit disabled when detecting workflows, but not in
runner `FetchTask`.
So if a workflow was detected when action unit is enabled, but disabled
later, `FetchTask` will still return these detected actions.

Global setting: repo.ENABLED and repository.`DISABLED_REPO_UNITS` will
not effect this.

Co-authored-by: yp05327 <576951401@qq.com>
AvengerMoJo pushed a commit to AvengerMoJo/gitea that referenced this pull request Apr 8, 2024
…ected (go-gitea#30331)

Fix go-gitea#30243

We only checking unit disabled when detecting workflows, but not in
runner `FetchTask`.
So if a workflow was detected when action unit is enabled, but disabled
later, `FetchTask` will still return these detected actions.

Global setting: repo.ENABLED and repository.`DISABLED_REPO_UNITS` will
not effect this.
@yp05327 yp05327 deleted the fix-30243 branch April 8, 2024 23:59
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 9, 2024
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix missed doer (go-gitea#30231)
  Add optional doctor storage init (go-gitea#30330)
  Avoid running action when action unit is disabled after workflows detected (go-gitea#30331)
  Avoid showing `Failed to change the default wiki branch` if repo has no wiki when saving repo settings (go-gitea#30329)
@wolfogre
Copy link
Member

wolfogre commented Apr 10, 2024

@lunny You added backport/v1.21 after backport/done.

image

Please decide whether to remove the label or backport manually, and also #30382.

lunny pushed a commit that referenced this pull request Apr 10, 2024
Fix regression of #30331.

```txt
time="2024-04-10T02:23:49Z" level=error msg="failed to fetch task" func="[fetchTask]" file="[poller.go:91]" error="unknown: rpc error: code = Internal desc = pick task: CreateTaskForRunner: Error 1052 (23000): Column 'id' in field list is ambiguous"
```
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 10, 2024
Fix regression of go-gitea#30331.

```txt
time="2024-04-10T02:23:49Z" level=error msg="failed to fetch task" func="[fetchTask]" file="[poller.go:91]" error="unknown: rpc error: code = Internal desc = pick task: CreateTaskForRunner: Error 1052 (23000): Column 'id' in field list is ambiguous"
```
lunny pushed a commit that referenced this pull request Apr 10, 2024
Backport #30382 by @wolfogre

Fix regression of #30331.

```txt
time="2024-04-10T02:23:49Z" level=error msg="failed to fetch task" func="[fetchTask]" file="[poller.go:91]" error="unknown: rpc error: code = Internal desc = pick task: CreateTaskForRunner: Error 1052 (23000): Column 'id' in field list is ambiguous"
```

I have tested it in my local env, and it should work now.

Co-authored-by: Jason Song <i@wolfogre.com>
@lunny lunny removed the backport/v1.21 This PR should be backported to Gitea 1.21 label Apr 10, 2024
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 27, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 7, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Actions are triggered on a repository even if it's actions are disabled
5 participants