style: remove previous line from jinja directives

daks commented 4 years ago

PR progress checklist (to be filled in by reviewers)

[ ] Changes to documentation are appropriate (or tick if not required)
[ ] Changes to tests are appropriate (or tick if not required)
[ ] Reviews completed

What type of PR is this?

Primary type

[ ] [build] Changes related to the build system
[ ] [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
[ ] [ci] Changes to the continuous integration configuration
[ ] [feat] A new feature
[ ] [fix] A bug fix
[ ] [perf] A code change that improves performance
[ ] [refactor] A code change that neither fixes a bug nor adds a feature
[ ] [revert] A change used to revert a previous commit
[X] [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

[ ] [docs] Documentation changes
[ ] [test] Adding missing or correcting existing tests

Does this PR introduce a `BREAKING CHANGE`?

No.

Related issues and/or pull requests

none

Describe the changes you're proposing

A simple style PR to remove whitespace blocks with Jinja directives, to ease debugging.

Pillar / config required to test the proposed changes

-

Debug log showing how the proposed changes work

-

Documentation checklist

[ ] Updated the README (e.g. Available states).
[ ] Updated pillar.example.

Testing checklist

[ ] Included in Kitchen (i.e. under state_top).
[ ] Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
[ ] Updated the relevant test pillar.

Additional context

myii commented 4 years ago

@daks I approved the changes and then I noticed Travis! Realised straight away that we were probably encountering the whitespace control issue and sure enough, it works when fixed:

https://travis-ci.org/myii/mysql-formula/builds/619763336

That also includes fixing/ignoring the shellcheck failure, so I'll merge that in now so that builds stop failing in this repo.

myii commented 4 years ago

@daks So let's get #233 merged and then rebase this PR on top.

daks commented 4 years ago

I commited your suggested changes. I'll let you merge #233 before if needed.

myii commented 4 years ago

Merged, thanks @daks.

saltstack-formulas-travis commented 4 years ago

:tada: This PR is included in version 0.52.4 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

saltstack-formulas / mysql-formula