go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-03-17 21:08:01 +02:00
Code Issues Releases Activity

fix: interpolate vars in defer (#1814)

Browse Source 
Co-authored-by: Andrey Nering <andreynering@users.noreply.github.com>
This commit is contained in:
Valentin Maerten 2024-09-19 03:17:53 +02:00 committed by GitHub
parent 0be05795b9
commit 1bf850592c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
task.go
View File

@ -324,8 +324,13 @@ func (e *Executor) runDeferred(t *ast.Task, call *ast.Call, i int, deferredExitC
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
origTask, err := e.GetTask(call)
if err != nil {
return
}
cmd := t.Cmds[i]
vars, _ := e.Compiler.FastGetVariables(t, call)
vars, _ := e.Compiler.FastGetVariables(origTask, call)
cache := &templater.Cache{Vars: vars}
extra := map[string]any{}

4
task_test.go
View File

@ -1788,7 +1788,7 @@ func TestExitCodeZero(t *testing.T) {
require.NoError(t, e.Setup())
require.NoError(t, e.Run(context.Background(), &ast.Call{Task: "exit-zero"}))
assert.Equal(t, "EXIT_CODE=", strings.TrimSpace(buff.String()))
assert.Equal(t, "FOO=bar - EXIT_CODE=", strings.TrimSpace(buff.String()))
}
func TestExitCodeOne(t *testing.T) {
@ -1802,7 +1802,7 @@ func TestExitCodeOne(t *testing.T) {
require.NoError(t, e.Setup())
require.Error(t, e.Run(context.Background(), &ast.Call{Task: "exit-one"}))
assert.Equal(t, "EXIT_CODE=1", strings.TrimSpace(buff.String()))
assert.Equal(t, "FOO=bar - EXIT_CODE=1", strings.TrimSpace(buff.String()))
}
func TestIgnoreNilElements(t *testing.T) {

8
testdata/exit_code/Taskfile.yml vendored
View File

@ -7,11 +7,15 @@ vars:
tasks:
exit-zero:
vars:
FOO: bar
cmds:
- defer: echo {{.PREFIX}}{{.EXIT_CODE}}
- defer: echo FOO={{.FOO}} - {{.PREFIX}}{{.EXIT_CODE}}
- exit 0
exit-one:
vars:
FOO: bar
cmds:
- defer: echo {{.PREFIX}}{{.EXIT_CODE}}
- defer: echo FOO={{.FOO}} - {{.PREFIX}}{{.EXIT_CODE}}
- exit 1