Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-12-04 23:31:05 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: ensure both default and dynamic environment variables are merged

Browse Source 
- Added logic to merge variables from both `ENV` and `JSON` fields
- Resolved issue where default environment variables were not being set
This commit is contained in:
Robert Tajnšek 2024-09-20 21:51:19 +02:00
parent 62e5045f3b
commit 34443ad5e4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/tasks/LocalJob.go
View File

@ -150,6 +150,13 @@ func (t *LocalJob) getEnvironmentExtraVarsJSON(username string, incomingVersion
func (t *LocalJob) getEnvironmentENV() (res []string, err error) { func (t *LocalJob) getEnvironmentENV() (res []string, err error) {
environmentVars := make(map[string]string) environmentVars := make(map[string]string)
if t.Environment.ENV != nil {
err = json.Unmarshal([]byte(*t.Environment.ENV), &environmentVars)
if err != nil {
return
}
}
if t.Environment.JSON != "" { if t.Environment.JSON != "" {
err = json.Unmarshal([]byte(t.Environment.JSON), &environmentVars) err = json.Unmarshal([]byte(t.Environment.JSON), &environmentVars)
if err != nil { if err != nil {