Skip to content

Edit INSTALL.md to match current options #328

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

Merged
merged 9 commits into from
Feb 7, 2017
Merged

Edit INSTALL.md to match current options #328

merged 9 commits into from
Feb 7, 2017

Conversation

rouson
Copy link
Member

@rouson rouson commented Feb 7, 2017

No description provided.

Copy link
Collaborator

@zbeekman zbeekman left a comment

Choose a reason for hiding this comment

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

@rouson Can you please roll back 51a047f assuming that it is still the latest commit on edit-install-doc? The reason is that the PDF linked is not a static PDF, it is AUTOMAGICALLY generated from the markdown file when it is posted to GitHub 🐇 🔮 🎩 ✨

Here are instructions for doing this:

git checkout edit-install-doc
git reset --hard ^51a047f53110b0c28f944ec0b2c917c283b9b84c # drop this commit by resetting to its parent (thats what the ^ carat indicates)
git push --force origin edit-install-doc

As of release 1.2.0, users might consider installing by downloading and uncompressing
a file from our [Releases] page and running the installation script in the top-level
source directory:
OS X users may use the [Homebrew] or [MacPorts] package management systems to install OpenCoarrays.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you please add a note that Homebrew is the preferred method? I should be able to get it to the point where our CI/release scripts automatically submit a PR with the updated Homebrew formula to homebrew-core. Then we won't have to continue maintaining MacPorts, unless you really want to...

Copy link
Member Author

Choose a reason for hiding this comment

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

I just added the following "We recommend [Homebrew]." As long as afanfa is willing to continue maintaining the MacPorts port, I'd like to keep it as an option. Even if Homebrew is better, switching is non-trivial and therefore presents a barrier to existing MacPorts users.

INSTALL.md Outdated
@@ -7,116 +7,135 @@
Installing OpenCoarrays
=======================

[![Download as PDF][pdf img]](http://md2pdf.herokuapp.com/sourceryinstitute/opencoarrays/blob/master/INSTALL.pdf)
[The following link is commented until it can be updated. To uncomment delete the backslashes, the ourtermost square brackets, and the trailing colon and hash mark]:#
[\[\!\[Download as PDF]\][pdf img]](http://md2pdf.herokuapp.com/sourceryinstitute/opencoarrays/blob/master/INSTALL.pdf)]:#
Copy link
Collaborator

Choose a reason for hiding this comment

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

@rouson Please don't comment this out: This is a service that I setup that automatically generates the PDFs from the markdown pages when they are posted to GitHub, so it is never out of date! The best thing to do, assuming that 51a047f is still the HEAD commit on edit-install-doc would be the following:

git checkout edit-install-doc
git reset --hard ^51a047f53110b0c28f944ec0b2c917c283b9b84c # drop this commit by resetting to its parent (thats what the ^ carat indicates)
git push --force origin edit-install-doc

This will delete all commits after 51a047f's parent commit (so don't do this if you have committed more local changes) and reset HEAD to be 51a047f's parent commit, i.e., 28054a6

Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I reverted the commit that attempted to comment the PDF link. When I tested it, I forgot that it points to the master branch and therefore would not reflect my changes on a separate branch so I mistakenly thought something had to be done to update the PDF. Thanks for clarifying.

@zbeekman
Copy link
Collaborator

zbeekman commented Feb 7, 2017

Also, in the future if you put [ci skip] in your commit comments when you're only editing markdown files then we won't have to run all these commits through Travis-CI

@rouson
Copy link
Member Author

rouson commented Feb 7, 2017

@zbeekman I think I addressed each of your concerns except that I forgot to include the [ci skip] text in my post recent commit. I see links labeled "See review" and "Dismiss review", but I don't see any way to indicate that I've made the changes requested in the review so I hope it's ok if I go ahead and merge this branch into master and delete the branch.

@rouson rouson merged commit f652a7b into master Feb 7, 2017
@rouson rouson deleted the edit-install-doc branch February 7, 2017 21:18
@zbeekman
Copy link
Collaborator

zbeekman commented Feb 7, 2017

@zbeekman I think I addressed each of your concerns except that I forgot to include the [ci skip] text in my post recent commit. I see links labeled "See review" and "Dismiss review", but I don't see any way to indicate that I've made the changes requested in the review so I hope it's ok if I go ahead and merge this branch into master and delete the branch.

Good enough for government work! The usual protocol is for the person who did the review to sign off on it, but these are small documentation changes...

LGTM!

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.

2 participants