mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-16 18:29:18 +08:00
Code Packages Projects Releases Wiki Activity

No global variables (#30402)

Browse Source 
Fix #30361, regression of #29782 which is a backport, not the original
#29468.

#29468 did a small refactor which introduced a new function
`GetVariablesOfRun`. However, it's designed for v1.22 which supports
global variables.

After backporting it to v1.21, it will still try to get global
variables, which causes it to retrieve all variables.
This commit is contained in:
Jason Song 2024-04-11 11:25:05 +08:00 committed by GitHub
parent 9149221845
commit 6cfe67cfc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
models/actions/variable.go
View File

@ -100,13 +100,6 @@ func UpdateVariable(ctx context.Context, variable *ActionVariable) (bool, error)
func GetVariablesOfRun(ctx context.Context, run *ActionRun) (map[string]string, error) { func GetVariablesOfRun(ctx context.Context, run *ActionRun) (map[string]string, error) {
variables := map[string]string{} variables := map[string]string{}
// Global
globalVariables, err := FindVariables(ctx, FindVariablesOpts{})
if err != nil {
log.Error("find global variables: %v", err)
return nil, err
}
// Org / User level // Org / User level
ownerVariables, err := FindVariables(ctx, FindVariablesOpts{OwnerID: run.Repo.OwnerID}) ownerVariables, err := FindVariables(ctx, FindVariablesOpts{OwnerID: run.Repo.OwnerID})
if err != nil { if err != nil {
@ -121,8 +114,8 @@ func GetVariablesOfRun(ctx context.Context, run *ActionRun) (map[string]string,
return nil, err return nil, err
} }
// Level precedence: Repo > Org / User > Global // Level precedence: Repo > Org / User
for _, v := range append(globalVariables, append(ownerVariables, repoVariables...)...) { for _, v := range append(ownerVariables, repoVariables...) {
variables[v.Name] = v.Data variables[v.Name] = v.Data
} }