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

TravisCI: include pages of all languages in archive #2567

Merged
merged 2 commits into from
Nov 9, 2018

Conversation

arunisaac
Copy link
Contributor

Now that we are supporting pages in multiple natural languages (#2339), we need to include all those pages in the tldr archive.

scripts/build.sh Outdated
@@ -25,7 +25,7 @@ function build_archive {
rm -f $TLDR_ARCHIVE

cd $TLDRHOME/
zip -r $TLDR_ARCHIVE pages/ LICENSE.md
zip -r $TLDR_ARCHIVE pages/ pages.*/ LICENSE.md
Copy link
Member

Choose a reason for hiding this comment

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

Why not just pages*/ ?

Copy link
Member

Choose a reason for hiding this comment

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

Does it even work with the . there, considering that the English pages directory does not have a suffix?

Copy link
Member

Choose a reason for hiding this comment

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

@waldyrious, I assume it would in the initial one as it has pages/ pages.*/ so that would catch both.

Copy link
Member

Choose a reason for hiding this comment

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

Oh yeah hahah, I totally misinterpreted the diff!

@sbrl sbrl added the tooling Helper tools, scripts and automated processes. label Nov 8, 2018
@arunisaac
Copy link
Contributor Author

arunisaac commented Nov 9, 2018 via email

@waldyrious waldyrious merged commit 6bfdbef into tldr-pages:master Nov 9, 2018
@waldyrious
Copy link
Member

@arunisaac just for reference, github's squash option does not automatically interpret the fixup! directive in the commit message. I had to manually remove the second commit's message when merging. It's certainly something that would be nice for them to support.

@arunisaac
Copy link
Contributor Author

arunisaac commented Nov 9, 2018 via email

@waldyrious
Copy link
Member

waldyrious commented Nov 9, 2018

In the future, should I use the "fixup!" prefix?

It's up to you. Maintainers should ask in case they need git actions from the contributor, anyway. In this case, what needed to happen was pretty straightforward (and could be done in the merge process) so I just went ahead and did it.

is there some other preferred way for github to automatically recognize commit messages to be squashed?

Not that I know of. :/

@arunisaac arunisaac deleted the tldr-archive branch November 15, 2018 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tooling Helper tools, scripts and automated processes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants