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

Correct lein REPL example in README.md #207

Merged
merged 1 commit into from
Jul 18, 2016

Conversation

lverns
Copy link
Contributor

@lverns lverns commented Jul 18, 2016

No description provided.

@lspector lspector merged commit 7d6a680 into lspector:master Jul 18, 2016
@thelmuth
Copy link
Collaborator

Just FYI: remember that now @lspector needs to include release info in his commit message. Thus, the last few merges haven't changed the version at all. Use your own discretion about major/minor/patch updates.

@lspector
Copy link
Owner

Hmm. I'm just looking at the changes via my browser and hitting "merge." No commit message or anything like that. No command line. I sort-of gather from @saulshanabrook's comment that you linked that I need to do a lein release but I'm not sure when/where/how in relation to my current process.

@saulshanabrook
Copy link
Collaborator

Nope, no lein release needed! Just push a commit with the words lein release patch or lein release minor in the commit message. So this could be actually an empty commit, something like this:

# first make sure we are at the latest commit
git checkout master
git pull master

# then make our commit
git commit --allow-empty -m "lein release minor"
git push

I know this isn't probably ideal. A button that says "RELEASE ME NOW" would be much easier, but that is harder to fit within the Travis CI test/release process.

There are many ways of implementing such a button, or a Slack command, but I haven't felt like looking into them/maintaining them.

Let me know if you have any more Qs or suggestions, happy to explore other alternatives.

@thelmuth
Copy link
Collaborator

Hmm. I'm just looking at the changes via my browser and hitting "merge." No commit message or anything like that. No command line. I sort-of gather from @saulshanabrook's comment that you linked that I need to do a lein release but I'm not sure when/where/how in relation to my current process.

Merge commits have commit messages. I'm not sure if you can change them on GitHub, but I think so; this says that you can add a commit message during the process. @saulshanabrook: would your code pick up commit messages from commits made on GitHub, or does it have to be a local commit?

@saulshanabrook
Copy link
Collaborator

Any commit. Yeah if you can change the commit message on a merge, you can just add that line. It just looks for the last commit, when building, and looks at the status.

@lspector
Copy link
Owner

I just merged a pull request of Tom's, via the web interface, with "lein release minor" added to the commit message... I guess we'll see what happens :-)

-Lee

On Jul 19, 2016, at 8:32 AM, Saul Shanabrook notifications@github.com wrote:

Any commit. Yeah if you can change the commit message on a merge, you can just add that line. It just looks for the last commit, when building, and looks at the status.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub #207 (comment), or mute the thread https://github.com/notifications/unsubscribe-auth/AAPEGLvCxq06qKRtxlEJCSlwv9WA84ptks5qXMPegaJpZM4JOvgE.

Lee Spector, Professor of Computer Science
Director, Institute for Computational Intelligence
Hampshire College, Amherst, Massachusetts, USA
lspector@hampshire.edu, http://hampshire.edu/lspector/, 413-559-5352

@saulshanabrook
Copy link
Collaborator

@lspector It did not work, I am investigating

@saulshanabrook
Copy link
Collaborator

Ah I see, I was running git log --format=%B --no-merges -n 1... The key part is the --no-merges, so it skipped that commit and read the previous one, which was Refactored make-agents-and-rng into 3 functions.

I will remove the --no-merges and try another PR with some minor change to see if it works.

@lspector
Copy link
Owner

Is it working? Also, any guidance on when I should include "lein release minor"? @thelmuth just submitted another pull request (Checksum more test cases (#210)) and I'm not clear about whether that should count as a minor release or not. I'd be inclined to do it for every merge, but I don't know if that's right.

@lverns lverns deleted the documentation branch July 23, 2016 20:38
@thelmuth
Copy link
Collaborator

@lspector I'd use your best judgement as to where the change fits in the semantic versioning scheme. Patches are basically for bug fixes, changes to READMEs, small tweaks, etc. Minor versions add functionality, features, etc. Major versions should be significant changes that likely break backwards compatibility -- a good example would be the change to Plush genomes. I'd imagine many of the commits will be minor versions, as you say, unless the change is very small.

@saulshanabrook
Copy link
Collaborator

@lspector Yep it's working, but it has to be lein release :minor instead of lein release minor :)

@lspector
Copy link
Owner

Thanks @saulshanabrook -- next time I'll do that.

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.

None yet

4 participants