Skip to content

Update Travis to GCC6, provide a workaround for #1028 #1080

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 9 commits into from
Jun 1, 2016
Merged

Update Travis to GCC6, provide a workaround for #1028 #1080

merged 9 commits into from
Jun 1, 2016

Conversation

@peternewman
Copy link
Member

@peternewman peternewman commented May 21, 2016 •
edited
Loading

Provides a workaround for #1028 .

@peternewman peternewman added this to the 0.11.0 milestone May 21, 2016
@nomis52
Copy link
Member

nomis52 commented May 22, 2016

LGTM

@peternewman
Copy link
Member Author

peternewman commented May 22, 2016

Thanks, we may as well wait for #1081 to get merged before merging this.

@peternewman peternewman changed the title Resync 0.10 into master Update Travis to GCC6, provide a workaround for #1028 and resync 0.10 into master May 30, 2016
@peternewman
Copy link
Member Author

peternewman commented May 30, 2016

@nomis52 this lot is good to go know. Do you think we should cherry-pick the #1028 fix into 0.10.3?

@peternewman peternewman mentioned this pull request May 30, 2016
Open
@peternewman
Copy link
Member Author

peternewman commented May 30, 2016

@sl1200mk2 confirmed this fixed the build for him on Arch with GCC 6.1.1, so cherry-picking this sounds like it would be worthwhile.

@peternewman peternewman mentioned this pull request May 30, 2016
Merged
@nomis52
Copy link
Member

nomis52 commented May 30, 2016

Can you do a separate PR with the resync please. It's hard to keep track of the changes.

@peternewman peternewman changed the title Update Travis to GCC6, provide a workaround for #1028 and resync 0.10 into master Update Travis to GCC6, provide a workaround for #1028 May 30, 2016
@peternewman
Copy link
Member Author

peternewman commented May 30, 2016

This just has the changes now @nomis52 .

@nomis52
Copy link
Member

nomis52 commented Jun 1, 2016

LGTM

@peternewman peternewman merged commit b3c065d into OpenLightingProject:master Jun 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nomis52 nomis52

Labels

None yet

Projects

None yet

Milestone

0.11.0

Development

Successfully merging this pull request may close these issues.

2 participants

@peternewman @nomis52