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

Crystal 0.24.2 #5642

Merged
merged 38 commits into from Mar 9, 2018
Merged

Crystal 0.24.2 #5642

merged 38 commits into from Mar 9, 2018

Conversation

matiasgarciaisaia
Copy link
Member

See #5358 for context on why we have this PR going :)

We're still missing a couple of changes on the release process before actually releasing this - please don't merge yet.

cotsog and others added 10 commits December 26, 2017 14:47
* Fix docs directory in gitignore.ecr (renamed in #4937)
Debug::DWARF::LineNumbers would skip the program statement when it
contained a single entry, because of a wrong assumption of the
sequence unit_length entry, which doesn't account for the unit
length space in the standard, and was overlooked in checking whether
the sequence had any program statement, or not.
* Add ASTNode#single_expression and refactor with using it

Fixed #5482
Fixed #5511

But this commit contains no spec for #5511 because I don't know where to
place such a spec.

* Add spec for #5511

Thank you @asterite!
See: #5513 (comment)
@matiasgarciaisaia matiasgarciaisaia added this to the 0.24.2 milestone Jan 25, 2018
waj and others added 2 commits January 25, 2018 18:31
…L::Context::Server

Fixes #5266

x509 certificates have a purpose associated to them. Clients should
verify that the server's certificate is intended to be used in a
server, and servers should check the client's certificate is
intended to be used for clients.

Crystal was mistakingly checking those mixed up.

See https://wiki.openssl.org/index.php?title=Manual:X509(1)&oldid=1797#CERTIFICATE_EXTENSIONS
See https://tools.ietf.org/html/rfc5280#section-4.2.1.3
@RX14
Copy link
Contributor

RX14 commented Jan 25, 2018

Shouldn't this be PRing the changelog into release/0.24?

@RX14
Copy link
Contributor

RX14 commented Jan 25, 2018

All the commits in release/0.24 should have been cherry-picked into master (or vice-versa) so this PR looks incorrect...

The changelog edits should be in your fork, being PRed into release/0.24.

@Sija
Copy link
Contributor

Sija commented Mar 8, 2018

Why this release contains only cherry-picked commits/PRs, instead (like it was before) including all since the previous release?

@matiasgarciaisaia
Copy link
Member Author

The idea is to have point-releases as bugfix-only. We would have wanted this to be released shortly after 0.24.1, but we didn't do that on time.

SemVer allows us to do whatever we want before 1.0, but we should at some point start to practice following it as if we were 1.0. So 0.24.2 would be a bugfix release - no new features.

There are also some specific reasons to have a new 0.24.2 release before releasing 0.25 with all the new features that are ready (namely, an issue with libgc that prevents us from building 32 bits on Docker).

So we can expect 0.25 to come "soon" after 0.24.2 (for really relaxed values of "soon").

@RX14
Copy link
Contributor

RX14 commented Mar 8, 2018

Next time, can we agree to commit everything to master and then cherry-pick those commits onto branches?

@bcardiff
Copy link
Member

bcardiff commented Mar 8, 2018

@Sija it's more a manner on how to to implement git-flow. If when more that one version is been developed at the same time (like a maintenance release branch vs master) at manas we find easier to track to fix things in one place an then merge into master once release is done (or even regularly). The merge commit serves as the intention to include all the fixes. We found cherrypicking harder to track and to check. For sure the merge commit can get wrong, but at least the intention is clear and serves as a point of discussion. We usually work using a slight modification of http://nvie.com/posts/a-successful-git-branching-model/ .

@jhass
Copy link
Member

jhass commented Mar 8, 2018

IME git-flow is good for a company internal workflow but falls apart if applied without modifications in a OSS context, mainly due awareness issues but also longer development cycles.

@RX14
Copy link
Contributor

RX14 commented Mar 8, 2018

Nah, git flow is just terrible in any context. Please do not attempt to apply it to crystal. Especially as back porting fixes branches like this should be super rare (only for security bugs).

@bcardiff bcardiff merged commit 4f9ed8d into master Mar 9, 2018
@Sija
Copy link
Contributor

Sija commented Mar 9, 2018

(WIP) still there (after merge)?

@asterite asterite changed the title (WIP) Crystal 0.24.2 Crystal 0.24.2 Mar 9, 2018
@Sija Sija mentioned this pull request Mar 12, 2018
@RX14 RX14 removed the pr:wip label Mar 17, 2018
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