Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generate Bindata iff TAGS="bindata" and not up-to-date #10004

Merged
merged 12 commits into from
Jan 27, 2020
Merged

Generate Bindata iff TAGS="bindata" and not up-to-date #10004

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aec9553
Only generate bindata if necessary
zeripath Jan 26, 2020
86c3b1a
Only generate bindata if they are not up-to-date
zeripath Jan 26, 2020
138bc6f
generate a hash of the fileinfo and use that to keep up-to-date
zeripath Jan 26, 2020
c8a48ed
Newer test is redundant
zeripath Jan 26, 2020
ad7d198
handle missing bindata and clean
zeripath Jan 26, 2020
1f68585
Merge remote-tracking branch 'origin/master' into only-genbindata-if-…
zeripath Jan 26, 2020
440a99d
Only update hash after successful write
zeripath Jan 26, 2020
4f2ab2b
switch to sha1 hash
zeripath Jan 26, 2020
f9835d6
Merge remote-tracking branch 'origin/master' into only-genbindata-if-…
zeripath Jan 26, 2020
7a4acca
Merge branch 'master' into only-genbindata-if-necessary
zeripath Jan 26, 2020
c930141
Apply suggestions from code review
zeripath Jan 26, 2020
ee57d80
Merge branch 'master' into only-genbindata-if-necessary
zeripath Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
switch to sha1 hash
  • Loading branch information
@zeripath
zeripath committed Jan 26, 2020
commit 4f2ab2bfcca185d10b3809e191eeaf4492e516cb
12 changes: 6 additions & 6 deletions scripts/generate-bindata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package main

import (
"bytes"
"crypto/sha1"
"fmt"
"hash/adler32"
"io/ioutil"
"log"
"net/http"
Expand All @@ -32,22 +32,22 @@ func needsUpdate(dir string, filename string) (bool, []byte) {
oldHash = []byte{}
}

adlerHash := adler32.New()
hasher := sha1.New()

err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, we're basically doing make's job. 😆

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. That's what you get when you mix two competing build systems ...

if err != nil {
return err
}
_, _ = adlerHash.Write([]byte(info.Name()))
_, _ = adlerHash.Write([]byte(info.ModTime().String()))
_, _ = adlerHash.Write([]byte(strconv.FormatInt(info.Size(), 16)))
_, _ = hasher.Write([]byte(info.Name()))
_, _ = hasher.Write([]byte(info.ModTime().String()))
_, _ = hasher.Write([]byte(strconv.FormatInt(info.Size(), 16)))
return nil
})
if err != nil {
return true, oldHash
}

newHash := adlerHash.Sum([]byte{})
newHash := hasher.Sum([]byte{})

if bytes.Compare(oldHash, newHash) != 0 {

Expand Down