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

Add code style check into CI pipeline #21

Merged
merged 12 commits into from
Nov 29, 2019

Conversation

martinssipenko
Copy link

@martinssipenko martinssipenko commented Nov 11, 2019

Adds checking of coding standard (PSR-12) as part of CI pipeline.

Resolves #18

@martinssipenko martinssipenko changed the title Ci++ Add code style check into CI pipeline Nov 11, 2019
Copy link

@piotrooo piotrooo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should squash similar commits with appropriate commit message.

This PR also closes #11

@martinssipenko
Copy link
Author

I’ll rebase this if #20 is merged first. Or if this gets merged as squash, then #20 can be closed.

Copy link

@NoelDavies NoelDavies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@NoelDavies
Copy link

I Merged in #20 - You can rebase this and I can merge this in

* master:
  Add support for prometheus/pushgateway:>=0.10 (endclothing#17)
  Introduce Continuous Integration (endclothing#20)
@martinssipenko
Copy link
Author

@NoelDavies done

@martinssipenko
Copy link
Author

Ugh, the test are failing because #17 was merged without working CI, I'll try to fix it.

@NoelDavies
Copy link

Ah sorry mate. I'm just going through them as I can.

@martinssipenko
Copy link
Author

@NoelDavies can you take a look at #22 and merge it?

@martinssipenko
Copy link
Author

I'm sorry for confusion, tests are failing due to bug in guzzle in version below 6.3. I'm updating minimum guzzle version which fixes the issue.

@martinssipenko
Copy link
Author

@NoelDavies it's now green, after merging this master branch builds will also become green.

@NoelDavies
Copy link

This would have to be a major version change as the dependency for guzzle changes.

@NoelDavies NoelDavies added this to the 1.1.0 milestone Nov 20, 2019
@martinssipenko
Copy link
Author

@NoelDavies It's a minor version change for guzzle which is backwards compatible, should also be a minor version for this package. Either way when using guzzle < 6.3 with current master it will not work, you will get the same error that was caught in tests.

@martinssipenko
Copy link
Author

@NoelDavies can we merge this to get CI green again?

@NoelDavies NoelDavies closed this Nov 29, 2019
@NoelDavies NoelDavies reopened this Nov 29, 2019
@NoelDavies NoelDavies closed this Nov 29, 2019
@NoelDavies NoelDavies reopened this Nov 29, 2019
@NoelDavies NoelDavies merged commit f4c614c into endclothing:master Nov 29, 2019
@NoelDavies
Copy link

Apologies I thought I'd merged this

martinssipenko added a commit to martinssipenko/prometheus_client_php that referenced this pull request Nov 29, 2019
* master:
  Add code style check into CI pipeline (endclothing#21)
martinssipenko added a commit to martinssipenko/prometheus_client_php that referenced this pull request Nov 29, 2019
* master:
  Add code style check into CI pipeline (endclothing#21)
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.

Use PHP-CS-Fixer
3 participants