go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-11-25 22:32:55 +02:00
Code Issues Releases Activity

fix: checksum variable in status is incorrect (#1080)

Browse Source 
* fix: checksum variable in status is incorrect

* chore: changelog
This commit is contained in:
Pete Davison
2023-03-23 21:09:16 +00:00
committed by GitHub
parent 34f15a4976
commit 738ffde962
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@
(`{{splitArgs "foo bar 'foo bar baz'"}}`) to ensure string is splitted as (`{{splitArgs "foo bar 'foo bar baz'"}}`) to ensure string is splitted as
arguments not whitespaces arguments not whitespaces
([#1040](https://github.com/go-task/task/issues/1040), [#1059](https://github.com/go-task/task/pull/1059) by @dhanusaputra). ([#1040](https://github.com/go-task/task/issues/1040), [#1059](https://github.com/go-task/task/pull/1059) by @dhanusaputra).
- Fix the value of `{{.CHECKSUM}}` variable in status ([#1076](https://github.com/go-task/task/issues/1076), [#1080](https://github.com/go-task/task/pull/1080) by @pd93).
## v3.22.0 - 2023-03-10 ## v3.22.0 - 2023-03-10

19
internal/fingerprint/sources_checksum.go
View File

@@ -37,12 +37,7 @@ func (checker *ChecksumChecker) IsUpToDate(t *taskfile.Task) (bool, error) {
data, _ := os.ReadFile(checksumFile) data, _ := os.ReadFile(checksumFile)
oldMd5 := strings.TrimSpace(string(data)) oldMd5 := strings.TrimSpace(string(data))
sources, err := globs(t.Dir, t.Sources) newMd5, err := checker.checksum(t)
if err != nil {
return false, err
}
newMd5, err := checker.checksum(sources...)
if err != nil { if err != nil {
return false, nil return false, nil
} }
@@ -74,7 +69,7 @@ func (checker *ChecksumChecker) IsUpToDate(t *taskfile.Task) (bool, error) {
} }
func (checker *ChecksumChecker) Value(t *taskfile.Task) (interface{}, error) { func (checker *ChecksumChecker) Value(t *taskfile.Task) (interface{}, error) {
return checker.checksum() return checker.checksum(t)
} }
func (checker *ChecksumChecker) OnError(t *taskfile.Task) error { func (checker *ChecksumChecker) OnError(t *taskfile.Task) error {
@@ -88,10 +83,14 @@ func (*ChecksumChecker) Kind() string {
return "checksum" return "checksum"
} }
func (c *ChecksumChecker) checksum(files ...string) (string, error) { func (c *ChecksumChecker) checksum(t *taskfile.Task) (string, error) {
h := md5.New() sources, err := globs(t.Dir, t.Sources)
if err != nil {
return "", err
}
for _, f := range files { h := md5.New()
for _, f := range sources {
// also sum the filename, so checksum changes for renaming a file // also sum the filename, so checksum changes for renaming a file
if _, err := io.Copy(h, strings.NewReader(filepath.Base(f))); err != nil { if _, err := io.Copy(h, strings.NewReader(filepath.Base(f))); err != nil {
return "", err return "", err

2
task_test.go
View File

@@ -691,7 +691,7 @@ func TestStatusVariables(t *testing.T) {
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "build"})) assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "build"}))
assert.Contains(t, buff.String(), "d41d8cd98f00b204e9800998ecf8427e") assert.Contains(t, buff.String(), "a41e7948dcd321db412ce61d3d5c9864")
inf, err := os.Stat(filepathext.SmartJoin(dir, "source.txt")) inf, err := os.Stat(filepathext.SmartJoin(dir, "source.txt"))
assert.NoError(t, err) assert.NoError(t, err)