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

feat(gitignore): track TOFS override files (salt & template) #130

Merged
merged 1 commit into from
Feb 14, 2020

Conversation

@myii myii merged commit c7fd200 into master Feb 14, 2020
@myii myii deleted the feat/track-tofs-gitignore-files branch February 14, 2020 16:09
@myii
Copy link
Owner Author

myii commented Feb 14, 2020

🎉 This PR is included in version 1.87.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@myii myii added the released label Feb 14, 2020
@dafyddj
Copy link
Contributor

dafyddj commented Feb 14, 2020

@myii do you agree that .bundle/ should be added to all formulas?

@myii
Copy link
Owner Author

myii commented Feb 14, 2020

@dafyddj Sure, I've just used this PR as a stop-gap before merging all of these into one .gitignore (short of time right now to run against all of the formulas). Do you agree with the changes in the salt-formula as well (the last few lines)?

@dafyddj
Copy link
Contributor

dafyddj commented Feb 14, 2020

Is it worth being explicit that .vagrant/ is a dir?
I don't recall coming across a top.sls myself. What is that used for?

@myii
Copy link
Owner Author

myii commented Feb 14, 2020

We'd have to ask @MSeven what the rationale is. I wasn't involved in that PR's review.

@dafyddj
Copy link
Contributor

dafyddj commented Feb 14, 2020

Ok, I might take a closer look at that.

@myii
Copy link
Owner Author

myii commented Feb 14, 2020

@dafyddj That would be helpful, thanks.

@MSeven
Copy link

MSeven commented Feb 14, 2020

.vagrant is required to ignore the working folder of the VM manager.
top.sls is ignored, because in the specific Vagrant setup script, the pillar.example is copied to top.sls to be used as a kind of default/test config.
The basic idea was to use Vagrant to create and initialize a throwaway VM that can be used to test and develop the formula with minimal extra effort.

If you don't plan to use a similar setup (which would require a Vagrantfile) you can simply remove these two lines from .gitignore.

To be honest, since i am not very involved in the development of the formula, i don't know how much this system is used and therefore cant really judge if it is at all worthwhile to include in the repo in the first place.

@myii
Copy link
Owner Author

myii commented Feb 14, 2020

@MSeven Thanks for the reply, this formula here is used to manage 60+ formulas under the SaltStack Formulas organisation, so changes we make here are propagated everywhere. We just want to clear up these issues so that we can have a common .gitignore across the org. With your feedback, I'm sure we can get closer to that result. My general feeling was to use your additions anyway.

@dafyddj
Copy link
Contributor

dafyddj commented Feb 14, 2020

Ok, so this is testing in Vagrant outside of Kitchen.
It seems to be a legacy dev/test method that isn't really needed now that we have pretty solidly settled on testing in Kitchen.

@myii
Copy link
Owner Author

myii commented Feb 14, 2020

@dafyddj Since the salt-formula still has the legacy Vagrant testing, let's leave the TOFS override for that formula. As for the rest, we'll use your latest addition and propagate that everywhere. What do you think?

@dafyddj
Copy link
Contributor

dafyddj commented Feb 14, 2020

Sounds good to me!

myii added a commit that referenced this pull request Feb 14, 2020
* Decision made during the discussion in #130
myii added a commit that referenced this pull request Feb 14, 2020
* Decision made during the discussion in #130
@myii
Copy link
Owner Author

myii commented Feb 14, 2020

@dafyddj Propagating via. #132 right now.

myii pushed a commit that referenced this pull request Feb 14, 2020
# [1.89.0](v1.88.0...v1.89.0) (2020-02-14)

### Features

* **gitignore:** standardise from the `template-formula` ([100906b](100906b)), closes [#130](#130)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants