-
-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
assets: add security@ipfs.io GPG key #2997
Conversation
@lgierth you made tests very upset |
1f9009d
to
d73f19b
Compare
I had to resurrect the vendored dir-index-html package -- this was the second time already that it was purged so I made the dependency a little more obvious for automated tools. Let's see how it goes. |
I think this is now dependent on go1.7 which made GOVENDOREXPERIMENT=1 the builtin default (or was it 1.6) |
7e71ad2
to
a926594
Compare
c3cf981
to
51467b7
Compare
The yak is not nearly shaved -- after resurrecting dir-index-html (again!) in a hacky way, now js-ipfs-api needs fixes to its tests... At least go-ipfs itself is green now. |
@lgierth we have gx for real now, we should probably just try and use it for dir-index-html (doesnt have to be now, but in the future) |
I am using gx for it now :) |
Oh, gotcha, carry on |
// assumes path to this file (assets.go) is: | ||
// $GOPATH/src/github.com/ipfs/go-ipfs/assets/assets.go | ||
filepath.Join("..", "..", "..", "..", "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html", "knownIcons.txt"), | ||
filepath.Join("..", "..", "..", "..", "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html", "dir-index.html"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know these paths are very hacky, but they're only ever used when running cd assets/ && go generate
-- I think this is a use case for gx as a library.
import gx "github.com/whyrusleeping/gx-go/lib"
var dirIndexPkg = "/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T/dir-index-html"
var initDirIndex = []string{
filepath.join(gx.PathTo(dirIndexPkg), "knownIcons.txt"),
filepath.join(gx.PathTo(dirIndexPkg), "dir-index.html"),
}
Or is there simply a way to get GOPATH? I didn't find one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gx-lib could install it in the local dir with an option Or something
On Sun, Sep 4, 2016, 23:32 Lars Gierth notifications@github.com wrote:
In assets/assets.go
#2997 (comment):@@ -30,8 +32,10 @@ func SeedInitDocs(nd _core.IpfsNode) (_key.Key, error) {
}var initDirIndex = []string{
- filepath.Join("..", "vendor", "dir-index-html-v1.0.0", "knownIcons.txt"),
- filepath.Join("..", "vendor", "dir-index-html-v1.0.0", "dir-index.html"),
- // assumes path to this file (assets.go) is:
- // $GOPATH/src/github.com/ipfs/go-ipfs/assets/assets.go
- filepath.Join("..", "..", "..", "..", "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html", "knownIcons.txt"),
- filepath.Join("..", "..", "..", "..", "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html", "dir-index.html"),
I know these paths are very hacky, but they're only ever used when running cd
assets/ && go generate -- I think this is a use case for gx as a library.import gx "github.com/whyrusleeping/gx-go/lib"
var dirIndexPkg = "/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T/dir-index-html"var initDirIndex = []string{
filepath.join(gx.PathTo(dirIndexPkg), "knownIcons.txt"),
filepath.join(gx.PathTo(dirIndexPkg), "dir-index.html"),
}Or is there simply a way to get GOPATH? I didn't find one.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
https://github.com/ipfs/go-ipfs/pull/2997/files/51467b79a7b24f5955143fc5a5f2243399b40568#r77459063,
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAIcoX5QVX0NCserADHOQ5DeGYjXUGSwks5qmzjmgaJpZM4JWRp7
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lgierth os.Getenv("GOPATH")
Blocked for now, gonna give this another go once ipfs-inactive/js-ipfs-http-client#365 is resolved |
rebased, travis failure looks unrelated: https://s3.amazonaws.com/archive.travis-ci.org/jobs/163734715/log.txt |
Can you also resolve #3256 in this PR (so we don't spam the rebuild of bindata), I think file with content like |
Sigh now it conflicts again |
It's good to go now |
LGTM |
@lgierth can you resolve the conflict and can we get it merged @whyrusleeping |
Can you also resolve #3184 in this PR? |
This will have to wait, sorry |
Sigh, now it's conflicting again |
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
rebased |
assets: add security@ipfs.io GPG key This commit was moved from ipfs/kubo@1261b90
I'll see if I have to update hashes in the tests...
Resolves #3256
License: MIT
Signed-off-by: Lars Gierth larsg@systemli.org