From 427e4fac6edf556635039fa41016c24181561595 Mon Sep 17 00:00:00 2001
From: Michael Matloka <dev@twixes.com>
Date: Mon, 1 Feb 2021 09:25:40 +0100
Subject: [PATCH] Improve handling of .git* files/dirs (#3141)

* Create .gitattributes

* Remove .github/ in posthog-foss sync

* .gitignore whole directories (recursively ofc)

* Remove .gitignore line from ages past
---
 .gitattributes                     |  7 +++++++
 .github/workflows/posthog-foss.yml |  3 ++-
 .gitignore                         | 11 +++++------
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..507cd01a11e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+* text=auto
+
+.gitattributes export-ignore
+.gitignore export-ignore
+.github/ export-ignore
+CONTRIBUTING.md export-ignore
+CODE_OF_CONDUCT.md export-ignore
diff --git a/.github/workflows/posthog-foss.yml b/.github/workflows/posthog-foss.yml
index aef823077fa..ff5e59a2bb8 100644
--- a/.github/workflows/posthog-foss.yml
+++ b/.github/workflows/posthog-foss.yml
@@ -4,6 +4,7 @@ on:
     push:
         branches:
             - master
+            - main
 
 jobs:
     repo-sync:
@@ -29,6 +30,6 @@ jobs:
                   author_name: PostHog Bot
                   author_email: hey@posthog.com
                   message: 'Sync and remove all non-FOSS parts'
-                  remove: '-r ee/'
+                  remove: ['-r ee/', '-r .github/']
               env:
                   GITHUB_TOKEN: ${{ secrets.SYNC_GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index debad4afd08..726253445e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,15 +10,14 @@ settings.yml
 debug.log
 *.swp
 *.swo
-impliu/static/CACHE/*
-node_modules/*
+node_modules/
 *.code-workspace
 node_modules
-.vscode/*
+.vscode/
 frontend/.cache/
 .mypy_cache
-frontend/dist/*
-frontend/types/*
+frontend/dist/
+frontend/types/
 *Type.ts
 frontend/yarn-error.log
 .idea
@@ -27,7 +26,7 @@ celerybeat.pid
 yarn-error.log
 .yalc
 yalc.lock
-cypress/screenshots/*
+cypress/screenshots/
 docker-compose.prod.yml
 .python-version
 *.isorted