From 0d5b85344376ac22440680c696fc42b2e3614972 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Tue, 23 Aug 2022 08:36:49 -0700 Subject: [PATCH] all: ensure .git* files are standard across subprojects Produced via: ```sh zig run ./dev/ensure-standard-files.zig ``` Signed-off-by: Stephen Gutekanst --- .gitattributes | 2 +- .gitignore | 2 +- ecs/.gitattributes | 2 ++ ecs/.github/FUNDING.yml | 1 + ecs/.github/pull_request_template.md | 5 +++++ ecs/.gitignore | 18 ++++++++++++++++++ freetype/.gitignore | 2 +- gamemode/.gitattributes | 2 ++ gamemode/.github/FUNDING.yml | 1 + gamemode/.github/pull_request_template.md | 5 +++++ gamemode/.gitignore | 18 ++++++++++++++++++ glfw/.gitattributes | 2 +- glfw/.gitignore | 2 +- gpu-dawn/.gitattributes | 2 +- gpu-dawn/.gitignore | 2 +- gpu/.gitattributes | 2 +- gpu/.github/pull_request_template.md | 2 +- gpu/.gitignore | 2 +- sysaudio/.github/FUNDING.yml | 1 + sysaudio/.github/pull_request_template.md | 5 +++++ sysaudio/.gitignore | 2 -- sysjs/.gitattributes | 2 ++ sysjs/.github/FUNDING.yml | 1 + sysjs/.github/pull_request_template.md | 5 +++++ sysjs/.gitignore | 18 +++++++++++++++++- 25 files changed, 93 insertions(+), 13 deletions(-) create mode 100644 ecs/.gitattributes create mode 100644 ecs/.github/FUNDING.yml create mode 100644 ecs/.github/pull_request_template.md create mode 100644 ecs/.gitignore create mode 100644 gamemode/.gitattributes create mode 100644 gamemode/.github/FUNDING.yml create mode 100644 gamemode/.github/pull_request_template.md create mode 100644 gamemode/.gitignore create mode 100644 sysaudio/.github/FUNDING.yml create mode 100644 sysaudio/.github/pull_request_template.md create mode 100644 sysjs/.gitattributes create mode 100644 sysjs/.github/FUNDING.yml create mode 100644 sysjs/.github/pull_request_template.md diff --git a/.gitattributes b/.gitattributes index 2b9b79e2..ba1273bd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ * text=auto eol=lf - +upstream/** linguist-vendored diff --git a/.gitignore b/.gitignore index 0b4957c5..feda423c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ zig-out/ /debug/ /build/ /build-*/ -/docgen_tmp/ \ No newline at end of file +/docgen_tmp/ diff --git a/ecs/.gitattributes b/ecs/.gitattributes new file mode 100644 index 00000000..ba1273bd --- /dev/null +++ b/ecs/.gitattributes @@ -0,0 +1,2 @@ +* text=auto eol=lf +upstream/** linguist-vendored diff --git a/ecs/.github/FUNDING.yml b/ecs/.github/FUNDING.yml new file mode 100644 index 00000000..99fd1066 --- /dev/null +++ b/ecs/.github/FUNDING.yml @@ -0,0 +1 @@ +github: slimsag diff --git a/ecs/.github/pull_request_template.md b/ecs/.github/pull_request_template.md new file mode 100644 index 00000000..3a057b7b --- /dev/null +++ b/ecs/.github/pull_request_template.md @@ -0,0 +1,5 @@ +Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/ecs) instead, sorry for the trouble! + +This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync. + +Once your PR is merged over there, it'll automatically sync to this repository. diff --git a/ecs/.gitignore b/ecs/.gitignore new file mode 100644 index 00000000..feda423c --- /dev/null +++ b/ecs/.gitignore @@ -0,0 +1,18 @@ +# This file is for zig-specific build artifacts. +# If you have OS-specific or editor-specific files to ignore, +# such as *.swp or .DS_Store, put those in your global +# ~/.gitignore and put this in your ~/.gitconfig: +# +# [core] +# excludesfile = ~/.gitignore +# +# Cheers! +# -andrewrk + +zig-cache/ +zig-out/ +/release/ +/debug/ +/build/ +/build-*/ +/docgen_tmp/ diff --git a/freetype/.gitignore b/freetype/.gitignore index 0b4957c5..feda423c 100644 --- a/freetype/.gitignore +++ b/freetype/.gitignore @@ -15,4 +15,4 @@ zig-out/ /debug/ /build/ /build-*/ -/docgen_tmp/ \ No newline at end of file +/docgen_tmp/ diff --git a/gamemode/.gitattributes b/gamemode/.gitattributes new file mode 100644 index 00000000..ba1273bd --- /dev/null +++ b/gamemode/.gitattributes @@ -0,0 +1,2 @@ +* text=auto eol=lf +upstream/** linguist-vendored diff --git a/gamemode/.github/FUNDING.yml b/gamemode/.github/FUNDING.yml new file mode 100644 index 00000000..99fd1066 --- /dev/null +++ b/gamemode/.github/FUNDING.yml @@ -0,0 +1 @@ +github: slimsag diff --git a/gamemode/.github/pull_request_template.md b/gamemode/.github/pull_request_template.md new file mode 100644 index 00000000..780268a2 --- /dev/null +++ b/gamemode/.github/pull_request_template.md @@ -0,0 +1,5 @@ +Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/gamemode) instead, sorry for the trouble! + +This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync. + +Once your PR is merged over there, it'll automatically sync to this repository. diff --git a/gamemode/.gitignore b/gamemode/.gitignore new file mode 100644 index 00000000..feda423c --- /dev/null +++ b/gamemode/.gitignore @@ -0,0 +1,18 @@ +# This file is for zig-specific build artifacts. +# If you have OS-specific or editor-specific files to ignore, +# such as *.swp or .DS_Store, put those in your global +# ~/.gitignore and put this in your ~/.gitconfig: +# +# [core] +# excludesfile = ~/.gitignore +# +# Cheers! +# -andrewrk + +zig-cache/ +zig-out/ +/release/ +/debug/ +/build/ +/build-*/ +/docgen_tmp/ diff --git a/glfw/.gitattributes b/glfw/.gitattributes index 2b9b79e2..ba1273bd 100644 --- a/glfw/.gitattributes +++ b/glfw/.gitattributes @@ -1,2 +1,2 @@ * text=auto eol=lf - +upstream/** linguist-vendored diff --git a/glfw/.gitignore b/glfw/.gitignore index 0b4957c5..feda423c 100644 --- a/glfw/.gitignore +++ b/glfw/.gitignore @@ -15,4 +15,4 @@ zig-out/ /debug/ /build/ /build-*/ -/docgen_tmp/ \ No newline at end of file +/docgen_tmp/ diff --git a/gpu-dawn/.gitattributes b/gpu-dawn/.gitattributes index 2b9b79e2..ba1273bd 100644 --- a/gpu-dawn/.gitattributes +++ b/gpu-dawn/.gitattributes @@ -1,2 +1,2 @@ * text=auto eol=lf - +upstream/** linguist-vendored diff --git a/gpu-dawn/.gitignore b/gpu-dawn/.gitignore index 0b4957c5..feda423c 100644 --- a/gpu-dawn/.gitignore +++ b/gpu-dawn/.gitignore @@ -15,4 +15,4 @@ zig-out/ /debug/ /build/ /build-*/ -/docgen_tmp/ \ No newline at end of file +/docgen_tmp/ diff --git a/gpu/.gitattributes b/gpu/.gitattributes index 2b9b79e2..ba1273bd 100644 --- a/gpu/.gitattributes +++ b/gpu/.gitattributes @@ -1,2 +1,2 @@ * text=auto eol=lf - +upstream/** linguist-vendored diff --git a/gpu/.github/pull_request_template.md b/gpu/.github/pull_request_template.md index 535c4f19..3f203f76 100644 --- a/gpu/.github/pull_request_template.md +++ b/gpu/.github/pull_request_template.md @@ -1,4 +1,4 @@ -Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/gpu-dawn) instead, sorry for the trouble! +Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/gpu) instead, sorry for the trouble! This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync. diff --git a/gpu/.gitignore b/gpu/.gitignore index 0b4957c5..feda423c 100644 --- a/gpu/.gitignore +++ b/gpu/.gitignore @@ -15,4 +15,4 @@ zig-out/ /debug/ /build/ /build-*/ -/docgen_tmp/ \ No newline at end of file +/docgen_tmp/ diff --git a/sysaudio/.github/FUNDING.yml b/sysaudio/.github/FUNDING.yml new file mode 100644 index 00000000..99fd1066 --- /dev/null +++ b/sysaudio/.github/FUNDING.yml @@ -0,0 +1 @@ +github: slimsag diff --git a/sysaudio/.github/pull_request_template.md b/sysaudio/.github/pull_request_template.md new file mode 100644 index 00000000..2645e4e5 --- /dev/null +++ b/sysaudio/.github/pull_request_template.md @@ -0,0 +1,5 @@ +Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/sysaudio) instead, sorry for the trouble! + +This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync. + +Once your PR is merged over there, it'll automatically sync to this repository. diff --git a/sysaudio/.gitignore b/sysaudio/.gitignore index fd00295b..feda423c 100644 --- a/sysaudio/.gitignore +++ b/sysaudio/.gitignore @@ -16,5 +16,3 @@ zig-out/ /build/ /build-*/ /docgen_tmp/ - -upstream/soundio/src/config.h diff --git a/sysjs/.gitattributes b/sysjs/.gitattributes new file mode 100644 index 00000000..ba1273bd --- /dev/null +++ b/sysjs/.gitattributes @@ -0,0 +1,2 @@ +* text=auto eol=lf +upstream/** linguist-vendored diff --git a/sysjs/.github/FUNDING.yml b/sysjs/.github/FUNDING.yml new file mode 100644 index 00000000..99fd1066 --- /dev/null +++ b/sysjs/.github/FUNDING.yml @@ -0,0 +1 @@ +github: slimsag diff --git a/sysjs/.github/pull_request_template.md b/sysjs/.github/pull_request_template.md new file mode 100644 index 00000000..18deebe7 --- /dev/null +++ b/sysjs/.github/pull_request_template.md @@ -0,0 +1,5 @@ +Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/sysjs) instead, sorry for the trouble! + +This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync. + +Once your PR is merged over there, it'll automatically sync to this repository. diff --git a/sysjs/.gitignore b/sysjs/.gitignore index ee7098f1..feda423c 100644 --- a/sysjs/.gitignore +++ b/sysjs/.gitignore @@ -1,2 +1,18 @@ -zig-out/ +# This file is for zig-specific build artifacts. +# If you have OS-specific or editor-specific files to ignore, +# such as *.swp or .DS_Store, put those in your global +# ~/.gitignore and put this in your ~/.gitconfig: +# +# [core] +# excludesfile = ~/.gitignore +# +# Cheers! +# -andrewrk + zig-cache/ +zig-out/ +/release/ +/debug/ +/build/ +/build-*/ +/docgen_tmp/