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

3. Travis astyle #20

Merged
merged 1 commit into from
Aug 12, 2016
Merged

3. Travis astyle #20

merged 1 commit into from
Aug 12, 2016

Conversation

iphydf
Copy link
Member

@iphydf iphydf commented Aug 9, 2016

Depends on #16


This change is Reviewable

@nurupo
Copy link
Member

nurupo commented Aug 9, 2016

Define "depends". Is it based on #16's branch, instead of master?

@nurupo
Copy link
Member

nurupo commented Aug 9, 2016

I see, I guess you meant "replaces".

@iphydf
Copy link
Member Author

iphydf commented Aug 9, 2016

I meant depends as in "is based on", but then I decided to drop the old one instead.

@nurupo
Copy link
Member

nurupo commented Aug 10, 2016

Reviewed 10 of 10 files at r1.
Review status: all files reviewed at latest revision, 1 unresolved discussion.


other/travis/toxcore-script, line 9 [r1] (raw file):

../apidsl/_build/apigen.native other/apidsl/toxav.in.h | $ASTYLE --options=other/astyle/astylerc > toxav/toxav.h
# Check if the code is formatted according to the astyle configuration.
$ASTYLE --options=other/astyle/astylerc tox*/*.[ch]

Just tox*/*.[ch]? There are, at very least, also other/*.[ch] and other/bootstrap_daemon/src/*.[ch].


Comments from Reviewable

@nurupo
Copy link
Member

nurupo commented Aug 10, 2016

Although it's out of scope of this PR, I just want to remind that there was a discussion about changing tox*_version_is_compatible() functions to use a macro, which might be an idea for a next PR someone makes.


Review status: all files reviewed at latest revision, 1 unresolved discussion.


Comments from Reviewable

@iphydf
Copy link
Member Author

iphydf commented Aug 10, 2016

Review status: 9 of 14 files reviewed at latest revision, 1 unresolved discussion.


other/travis/toxcore-script, line 9 [r1] (raw file):

Previously, nurupo wrote…

Just tox*/*.[ch]? There are, at very least, also other/*.[ch] and other/bootstrap_daemon/src/*.[ch].

I wanted to avoid a complex expression, but I've changed my mind. It's better we format everything we can.

Comments from Reviewable

@iphydf
Copy link
Member Author

iphydf commented Aug 10, 2016

It is indeed out of scope. This comment will get lost. You could instead open a ticket to keep track of the discussion.


Review status: 9 of 14 files reviewed at latest revision, 1 unresolved discussion.


Comments from Reviewable

@iphydf iphydf mentioned this pull request Aug 10, 2016
@iphydf
Copy link
Member Author

iphydf commented Aug 10, 2016

@nurupo is this one good to go now?

@iphydf iphydf changed the title Travis astyle 3. Travis astyle Aug 11, 2016
@iphydf iphydf force-pushed the travis-astyle branch 2 times, most recently from 0872baf to 2d4327a Compare August 11, 2016 23:56
@GrayHatter
Copy link

LGTM


Reviewed 7 of 10 files at r1, 5 of 6 files at r2, 2 of 2 files at r3.
Review status: all files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.


Comments from Reviewable

@GrayHatter
Copy link

:lgtm:


Review status: all files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.


Comments from Reviewable

We run astyle on Travis and check if there is a diff. The build terminates if
git finds a difference.
@GrayHatter
Copy link

:lgtm:


Reviewed 1 of 1 files at r4.
Review status: all files reviewed at latest revision, 1 unresolved discussion.


Comments from Reviewable

@iphydf iphydf merged commit 459f8f2 into TokTok:master Aug 12, 2016
@iphydf iphydf deleted the travis-astyle branch August 12, 2016 00:07
@iphydf iphydf added this to the v0.0.1 milestone Nov 6, 2016
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