Fix Actions being enabled accidentally (#24802) #24810
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Regression of go-gitea#24536. If the user doesn't explicitly disable Actions, it will be enabled. 1. Gitea will call `loadRepositoryFrom` before `loadActionsFrom`. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/setting.go#L234-L237 2. In `loadRepositoryFrom`, `rootCfg.Section("actions").Key("ENABLED").MustBool(true)` will set `actions.ENABLED` with `true`. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/repository.go#L313-L315 3. In `loadActionsFrom`, `rootCfg.Section("actions")` will get a section with Actions enabled. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/actions.go#L23-L26 Although the cause of the problem was using `true` by copy-paste mistake, it also surprised me that **`rootCfg.Section("actions").Key("ENABLED").MustBool(true)` doesn't only read, but also write.**
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/XS
silverwind
approved these changes
May 19, 2023
GiteaBot
added
lgtm/need 1
lunny
approved these changes
May 19, 2023
GiteaBot
added
lgtm/done
delvh
approved these changes
May 19, 2023
Codeberg-org
pushed a commit
to Codeberg-org/gitea
that referenced
this pull request
Jun 3, 2023
Backport go-gitea#24802 by @wolfogre Regression of go-gitea#24536. If the user doesn't explicitly disable Actions, it will be enabled. 1. Gitea will call `loadRepositoryFrom` before `loadActionsFrom`. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/setting.go#L234-L237 2. In `loadRepositoryFrom`, `rootCfg.Section("actions").Key("ENABLED").MustBool(true)` will set `actions.ENABLED` with `true`. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/repository.go#L313-L315 3. In `loadActionsFrom`, `rootCfg.Section("actions")` will get a section with Actions enabled. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/actions.go#L23-L26 Although the cause of the problem was using `true` by copy-paste mistake, it also surprised me that **`rootCfg.Section("actions").Key("ENABLED").MustBool(true)` doesn't only read, but also write.** Co-authored-by: Jason Song <i@wolfogre.com> (cherry picked from commit b369ed5)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #24802 by @wolfogre
Regression of #24536. If the user doesn't explicitly disable Actions, it will be enabled.
loadRepositoryFrombeforeloadActionsFrom.gitea/modules/setting/setting.go
Lines 234 to 237 in 25d4f95
loadRepositoryFrom,rootCfg.Section("actions").Key("ENABLED").MustBool(true)will setactions.ENABLEDwithtrue.gitea/modules/setting/repository.go
Lines 313 to 315 in 25d4f95
loadActionsFrom,rootCfg.Section("actions")will get a section with Actions enabled.gitea/modules/setting/actions.go
Lines 23 to 26 in 25d4f95
Although the cause of the problem was using
trueby copy-paste mistake, it also surprised me thatrootCfg.Section("actions").Key("ENABLED").MustBool(true)doesn't only read, but also write.