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

dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensu… #17853

Merged
merged 1 commit into from
Jul 16, 2020

Conversation

seamuslee001
Copy link
Contributor

…re that sites that manage their systems using git can access the db.json file

Overview

This updates the gitignore file as per adrienrn/php-mimetyper#15 I have tested this on a D8 build that we manage with git and confirm that i can now commit in the db.json file

Before

If you manage your site with git the db.json file gets missed

After

db.json file doesn't get missed

ping @kcristiano @eileenmcnaughton

…re that sites that manage their systems using git can access the db.json file
@civibot
Copy link

civibot bot commented Jul 15, 2020

(Standard links)

@civibot civibot bot added the master label Jul 15, 2020
@seamuslee001 seamuslee001 changed the base branch from master to 5.28 July 15, 2020 21:52
@civibot civibot bot added 5.28 and removed master labels Jul 15, 2020
@eileenmcnaughton
Copy link
Contributor

I can't think of any way to test this

@kcristiano
Copy link
Member

My logic is to have distmaker to create the tarballs with the PR applied.

The extract and inspect the .gitignore file.

I've done this and it looks good.

@seamuslee001
Copy link
Contributor Author

@kcristiano the problem with doing it via distmaker is that that only works for Drupal 7, WordPress, Joomla folks who manage using git, This doesn't solve it for those of us in D8 land who also manage our sites in git because composer will download from the source repo which has the problematic gitignore. Doing it this way ensures that it works for both D8 folks and also for distmaker because composer packages will apply this even in a d8 context

@eileenmcnaughton
Copy link
Contributor

@kcristiano please merge this when you are satisfied

@seamuslee001
Copy link
Contributor Author

@kcristiano I think i have mistook your comment about dismaker please disregard mine I think Kevin is saying he has applied and confirmed it works is that correct?

@kcristiano
Copy link
Member

@seamuslee001 I apologize that was a bad comment.

I created a 5.28 tarball (same as the one you linked to in the issue - I missed that)

Added to my git repo via the build process and then pushed. The new .gitignore works and the file can be committed.

This looks good to merge.

@seamuslee001
Copy link
Contributor Author

Test fails unrelated merging

@seamuslee001 seamuslee001 merged commit 29c92a3 into civicrm:5.28 Jul 16, 2020
@seamuslee001 seamuslee001 deleted the dev_wordpress_62 branch July 16, 2020 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants