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.

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 [email protected] GPG key #2997

Merged
merged 4 commits into from
Nov 2, 2016
Merged

assets: add [email protected] GPG key #2997

merged 4 commits into from
Nov 2, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jul 27, 2016

I'll see if I have to update hashes in the tests...

Resolves #3256

License: MIT
Signed-off-by: Lars Gierth [email protected]

@ghost ghost added topic/docs-ipfs Topic docs-ipfs topic/security Topic security labels Jul 27, 2016
@Kubuxu
Copy link
Member

Kubuxu commented Jul 27, 2016

@lgierth you made tests very upset

@whyrusleeping whyrusleeping added the need/author-input Needs input from the original author label Aug 4, 2016
@ghost ghost force-pushed the feat/gpg-key branch 2 times, most recently from 1f9009d to d73f19b Compare August 26, 2016 01:36
@ghost
Copy link
Author

ghost commented Aug 26, 2016

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.

@ghost ghost added need/review Needs a review and removed need/author-input Needs input from the original author labels Aug 26, 2016
@ghost
Copy link
Author

ghost commented Aug 26, 2016

I think this is now dependent on go1.7 which made GOVENDOREXPERIMENT=1 the builtin default (or was it 1.6)

@ghost ghost force-pushed the feat/gpg-key branch 2 times, most recently from 7e71ad2 to a926594 Compare August 31, 2016 23:40
@ghost ghost added need/author-input Needs input from the original author and removed need/review Needs a review labels Aug 31, 2016
@ghost ghost force-pushed the feat/gpg-key branch 2 times, most recently from c3cf981 to 51467b7 Compare September 1, 2016 01:20
@ghost
Copy link
Author

ghost commented Sep 1, 2016

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.

@whyrusleeping
Copy link
Member

@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)

@ghost
Copy link
Author

ghost commented Sep 1, 2016

@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 :)

@whyrusleeping
Copy link
Member

Oh, gotcha, carry on

@ghost ghost added status/blocked Unable to be worked further until needs are met and removed need/author-input Needs input from the original author labels Sep 4, 2016
// 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"),
Copy link
Author

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.

Copy link
Member

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 [email protected] 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
.

Copy link
Member

Choose a reason for hiding this comment

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

@lgierth os.Getenv("GOPATH")

@ghost
Copy link
Author

ghost commented Sep 5, 2016

Blocked for now, gonna give this another go once ipfs-inactive/js-ipfs-http-client#365 is resolved

@whyrusleeping whyrusleeping added the status/in-progress In progress label Sep 14, 2016
@flyingzumwalt flyingzumwalt removed the status/in-progress In progress label Sep 26, 2016
@ghost
Copy link
Author

ghost commented Sep 29, 2016

rebased, travis failure looks unrelated: https://s3.amazonaws.com/archive.travis-ci.org/jobs/163734715/log.txt

@ghost ghost added the need/review Needs a review label Sep 29, 2016
@Kubuxu
Copy link
Member

Kubuxu commented Sep 29, 2016

Can you also resolve #3256 in this PR (so we don't spam the rebuild of bindata), I think file with content like IPFS is active\n should be enough.

@ghost ghost self-assigned this Oct 3, 2016
@ghost
Copy link
Author

ghost commented Oct 5, 2016

Updated, this now also incorporates #3256 -- cc @Kubuxu you owe me a code review :)

@whyrusleeping
Copy link
Member

@lgierth @Kubuxu updates here?

@ghost
Copy link
Author

ghost commented Oct 28, 2016

Sigh now it conflicts again

@ghost
Copy link
Author

ghost commented Oct 28, 2016

It's good to go now

@Kubuxu
Copy link
Member

Kubuxu commented Oct 28, 2016

LGTM

@ghost ghost added RFM and removed need/review Needs a review labels Oct 30, 2016
@Kubuxu
Copy link
Member

Kubuxu commented Nov 2, 2016

@lgierth can you resolve the conflict and can we get it merged @whyrusleeping

@Kubuxu
Copy link
Member

Kubuxu commented Nov 2, 2016

Can you also resolve #3184 in this PR?

@Kubuxu Kubuxu added status/in-progress In progress and removed status/ready Ready to be worked labels Nov 2, 2016
@ghost
Copy link
Author

ghost commented Nov 2, 2016

Can you also resolve #3184 in this PR?

This will have to wait, sorry

@ghost
Copy link
Author

ghost commented Nov 2, 2016

Sigh, now it's conflicting again

Lars Gierth added 4 commits November 3, 2016 00:37
License: MIT
Signed-off-by: Lars Gierth <[email protected]>
License: MIT
Signed-off-by: Lars Gierth <[email protected]>
License: MIT
Signed-off-by: Lars Gierth <[email protected]>
License: MIT
Signed-off-by: Lars Gierth <[email protected]>
@ghost
Copy link
Author

ghost commented Nov 2, 2016

rebased

@whyrusleeping whyrusleeping merged commit 1261b90 into master Nov 2, 2016
@whyrusleeping whyrusleeping deleted the feat/gpg-key branch November 2, 2016 23:42
@whyrusleeping whyrusleeping removed the status/in-progress In progress label Nov 2, 2016
@ghost ghost mentioned this pull request Dec 23, 2016
hacdias pushed a commit to ipfs/boxo that referenced this pull request Jan 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RFM topic/docs-ipfs Topic docs-ipfs topic/security Topic security
Projects
None yet
Development

Successfully merging this pull request may close these issues.

IPFS is available hash
4 participants