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

refactor: remove dir-index-html submodule #8555

Merged
merged 117 commits into from
Nov 29, 2021

Conversation

longfeiWan9
Copy link
Contributor

@longfeiWan9 longfeiWan9 commented Nov 18, 2021

This PR will close #8532.

  • Moved dir-index-html submodule back to go-ipfs
  • Kept the commit history of dir-index-html
  • update docs to reflect the change
  • ensure binddata still works as expected with command go generate .
  • update go generate . to build ./assets/dir-index-html/dir-index.html from ./assets/dir-index-html/src/
  • remove ./assets/dir-index-html/.github|gx
  • decide if we squash or do merge commit

    @lidel: discussed during triage, due to the license change and related contributor signoffs (or their lack) we want to preserve original history and will merge this with merge commit

jbenet and others added 30 commits July 16, 2015 14:03
ffff
First part of the fix to ipfs/dir-index-html#3
adds url escaping of entries
Add "jpeg" as an alias to "jpg".
This template will only get passed the hash value if the hash is not already being shown in the path. If a hash value is passed in, it will display under the path in grey.

License: MIT
Singed-off-by: Jack Loughran <j@ckloughran.com>
Updates header, adds links
jessicaschilling and others added 15 commits July 27, 2020 13:49
This adds GithubAction that  runs the build and checks for any unstaged
changes. This ensures `src/dir-index.html` match the output `dir-index.html`
in the main directory.
- Links to direct CIDs now have ?filename= param to preserve name and content type
- When page is loaded on DNSLink website (based on Host header) then
  there is no public gateway endpoint.
  As a replacement, clicking on a CID opens it at cid.ipfs.io

Context: ipfs/dir-index-html#42

Closes ipfs#42
for some reason `-e` gets interpreted literally at CI.
This removes its use making the output look the same everywhere.
CI will now show diff if uncommited changes to make it easier to see what
caused CI to fail.
feat: improved CID column (filename and dnslink support)
* fix: disable translation of cids
* fix: explicit language of the document
@welcome

This comment has been minimized.

@longfeiWan9
Copy link
Contributor Author

Hi, @lidel I have successfully done the step of removing submodule into go-ipfs, and also keeping the commit history of dir-index-html. But I have a little issue to make sure go generate . works properly. I have tried running go generate . before and after removing submodule without seccess. Could you please help to review and see if I am doing everything fine ?

@lidel lidel changed the title remove dir-index-html submodule refactor: remove dir-index-html submodule Nov 19, 2021
Copy link
Member

@lidel lidel left a comment

Choose a reason for hiding this comment

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

Thank you for cleaning up this @longfeiWan9! ❤️

  • go generate . seems to work fine for me locally and on CI – ask around, could be macOS thing
  • I restarted CI and tests look good now
  • changes look good to me, but before we merge this, we need to clean up some things that are no longer needed. See comments inline.

assets/assets.go Show resolved Hide resolved
assets/dir-index-html/.github/ISSUE_TEMPLATE/config.yml Outdated Show resolved Hide resolved
assets/dir-index-html/.gx/lastpubver Outdated Show resolved Hide resolved
assets/dir-index-html/CHANGELOG.md Outdated Show resolved Hide resolved
assets/dir-index-html/LICENSE Outdated Show resolved Hide resolved
assets/dir-index-html/README.md Outdated Show resolved Hide resolved
assets/dir-index-html/README.md Outdated Show resolved Hide resolved
assets/dir-index-html/package.json Show resolved Hide resolved
assets/dir-index-html/test/go.mod Outdated Show resolved Hide resolved
@longfeiWan9
Copy link
Contributor Author

@lidel Thanks for all the comments. I have updated the code accordingly, could you please take a look at it to see I understand you and fix it correctly?

Copy link
Member

@lidel lidel left a comment

Choose a reason for hiding this comment

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

Looks good, thank you for cleaning this up @longfeiWan9

@aschmahmann this is ready for merging. Given the license change and related contributor signoffs (or their lack) we may want to preserve original history, but perhaps it is enough to have it on this PR, and only land squashed commit on master? I'm fine either way.

@lidel lidel mentioned this pull request Nov 23, 2021
80 tasks
@lidel lidel added this to the go-ipfs 0.11 milestone Nov 23, 2021
@lidel
Copy link
Member

lidel commented Nov 23, 2021

Discussed during triage: due to commits reaching way back beyond the license changes, and related contributor signoffs (or their lack) we want to preserve original history and will merge this with merge commit.

We most likely want to merge this one as last before the release, just so we can undo if something goes wrong.

@lidel lidel merged commit 72656ea into ipfs:master Nov 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove ./assets/dir-index-html submodule