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

[19.05] Re-version 19.05 as 19.05 - introducing the new 19.05. #7955

Merged
merged 1 commit into from May 14, 2019

Conversation

jmchilton
Copy link
Member

@jmchilton
Copy link
Member Author

dev got merged into 19.05 at some point, we don't really know when or how but we decided it would probably just be safest to call the thing on usegalaxy.org right now release_19.05.

@natefoo
Copy link
Member

natefoo commented May 14, 2019

It'd be cool if we could at least figure out how/when. Interesting that git makes this so difficult.

@nsoranzo
Copy link
Member

nsoranzo commented May 14, 2019

I think the issue is commit ee89a48, which was pushed to the release_19.05 branch (in addition to dev).

@natefoo
Copy link
Member

natefoo commented May 14, 2019

@nsoranzo Ah, good catch! How'd you find it?

@dannon
Copy link
Member

dannon commented May 14, 2019

@natefoo I posted it on Gitter last night. I still don't understand the PR reference on that commit, though.

(to elaborate, the way I found it was basically manually bisecting to check for the version string on all merge commits to release_19.05, since (as you found out as well) the automated bisect just finds the source commit)

@natefoo
Copy link
Member

natefoo commented May 14, 2019

@dannon ah thanks!

For the record:

I generated it doing something like git log --no-merges allgood..nobueno to find the substantive commit differences.
Where allgood and nobueno are branches checked out at af95770 and ee89a48 respectively.

@martenson
Copy link
Member

+0.1

I think we should backport #7935.

fwiw these are the PRs that got to release and shouldn't:

#7746
#7827
#7858
#7874
#7859
#7860
#7840

in addition to the merge commit being weird, this one is also weird

@nsoranzo
Copy link
Member

@nsoranzo Ah, good catch! How'd you find it?

I just grepped the output of git log release_19.05 for the most recent Merge ...release_19.05' into dev.

The last "correct" commit @dannon mentions (af95770) is simply the right parent of ee89a48 .

@dannon
Copy link
Member

dannon commented May 14, 2019

@natefoo That command was for generating https://gist.github.com/dannon/b4bb6dc5c470311957500d34eee01961, which was the extra changesets included.

@natefoo
Copy link
Member

natefoo commented May 14, 2019

D'oh

@dannon
Copy link
Member

dannon commented May 14, 2019

I'll backport #7935.

@dannon dannon merged commit b9c22de into galaxyproject:release_19.05 May 14, 2019
@jmchilton
Copy link
Member Author

Fixed up PR tags - re-tagging those listed by @martenson and went through a bunch of older 19.09 PRs not listed and made sure they weren't in release_19.05. Thanks all.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants