Skip to content

Commit 73505ce

Browse files
zach2goodzach2good
authored
Merge pull request #8332 from cocosolos/docker
Docker + CI Updates
2 parents 5c9acb5 + 7034493 commit 73505ce

59 files changed

Lines changed: 3617 additions & 1517 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
sql/backups/*.sql
2+
3+
# .gitignore (with edits: .vscode and modules/init.txt are needed in Docker context to avoid "-dirty" tag in builds)
4+
5+
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
6+
[Bb]in/
7+
[Oo]bj/
8+
9+
## Ignore Visual Studio temporary files, build results, and
10+
## files generated by popular Visual Studio add-ons.
11+
12+
# User-specific files
13+
*.suo
14+
*.user
15+
*.sln.docstates
16+
*.DS_Store
17+
18+
# Build results
19+
build/
20+
build*/
21+
lbuild/
22+
build_mariadb_32/
23+
build_mariadb_64/
24+
out/
25+
[Dd]ebug/
26+
[Rr]elease/
27+
x64/
28+
*_i.c
29+
*_p.c
30+
*.ilk
31+
*.meta
32+
*.obj
33+
*.pch
34+
*.pdb
35+
*.pgc
36+
*.pgd
37+
*.rsp
38+
*.sbr
39+
*.tlb
40+
*.tli
41+
*.tlh
42+
*.tmp
43+
*.log
44+
*.vspscc
45+
*.vssscc
46+
.builds
47+
*.pyc
48+
49+
# Visual C++ cache files
50+
ipch/
51+
*.aps
52+
*.ncb
53+
*.opensdf
54+
*.sdf
55+
*.opendb
56+
*.VC.db
57+
58+
# Visual Studio profiler
59+
*.psess
60+
*.vsp
61+
*.vspx
62+
63+
# Visual Studio Analyzer
64+
*.lastcodeanalysis*
65+
66+
# Guidance Automation Toolkit
67+
*.gpState
68+
69+
# ReSharper is a .NET coding add-in
70+
_ReSharper*
71+
72+
# Jetbrains directories
73+
.idea
74+
.fleet
75+
cmake-*
76+
77+
# NCrunch
78+
*.ncrunch*
79+
.*crunch*.local.xml
80+
81+
# Installshield output folder
82+
[Ee]xpress
83+
84+
# DocProject is a documentation generator add-in
85+
DocProject/buildhelp/
86+
DocProject/Help/*.HxT
87+
DocProject/Help/*.HxC
88+
DocProject/Help/*.hhc
89+
DocProject/Help/*.hhk
90+
DocProject/Help/*.hhp
91+
DocProject/Help/Html2
92+
DocProject/Help/html
93+
94+
# Click-Once directory
95+
publish
96+
97+
# Publish Web Output
98+
*.Publish.xml
99+
100+
# NuGet Packages Directory
101+
packages
102+
103+
# Windows Azure Build Output
104+
csx
105+
*.build.csdef
106+
107+
# Windows Store app package directory
108+
AppPackages/
109+
110+
# Others
111+
[Bb]in
112+
[Oo]bj
113+
TestResults
114+
[Tt]est[Rr]esult*
115+
*.Cache
116+
*.cache
117+
ClientBin
118+
[Ss]tyle[Cc]op.*
119+
~$*
120+
*.dbmdl
121+
Generated_Code #added for RIA/Silverlight projects
122+
123+
# Backup & report files from converting an old project file to a newer
124+
# Visual Studio version. Backup files are not needed, because we have git ;-)
125+
_UpgradeReport_Files/
126+
Backup*/
127+
UpgradeLog*.XML
128+
129+
# Compiled Object files
130+
*.slo
131+
*.lo
132+
*.o
133+
134+
# Executables
135+
*.exe
136+
*.out
137+
*.app
138+
139+
# Generated executables
140+
/xi_connect*
141+
/xi_map*
142+
/xi_search*
143+
/xi_test*
144+
/xi_world*
145+
146+
# Generated files, mostly autotools-related
147+
.deps
148+
/Makefile
149+
/Makefile.in
150+
/aclocal.m4
151+
/autom4te.cache
152+
/compile
153+
/configure
154+
/config.*
155+
/depcomp
156+
/missing
157+
/install-sh
158+
159+
src/common/config.h
160+
src/common/config.h.in
161+
src/common/stamp-h1
162+
163+
/sources.am
164+
165+
# Misc, such as vim swap files
166+
*.sw?
167+
168+
navmeshes/*.nav
169+
tags
170+
log/**
171+
!log/.gitkeep
172+
173+
# Lua Developement Tools project files
174+
.metadata/**
175+
.project
176+
.vs
177+
/win32/.vs/xi/v15
178+
.luarc.json
179+
lua-language-server*
180+
check.json
181+
lua_lang_errors.txt
182+
183+
# Visual Studio
184+
**/*.vcxproj*
185+
**/*.sln
186+
enc_temp_folder
187+
188+
# CMake files
189+
CMakeCache.txt
190+
Makefile
191+
**/CMakeFiles
192+
cmake_install.cmake
193+
/cmake-**/**
194+
195+
# ignore servers
196+
*-server
197+
198+
# non-default config files containing server specific things
199+
/conf/license.conf
200+
/conf/version.conf
201+
/conf/login.conf
202+
/conf/maint.conf
203+
/conf/map.conf
204+
/conf/packet_tcp.conf
205+
/conf/packet_udp.conf
206+
/conf/search_server.conf
207+
/conf/server_message.conf
208+
/conf/server_message_fr.conf
209+
210+
# non-default settings script files containing server specific things
211+
/scripts/settings/main.lua
212+
/settings/*.lua
213+
214+
# Tool/misc configs
215+
/tools/config.yaml
216+
ip.txt
217+
218+
# Tracy download
219+
ext/tracy/
220+
tracy.tar.gz
221+
222+
# Valgrind
223+
*.memcheck.log
224+
*.callgrind.log
225+
callgrind.out.*
226+
memcheck.out.*
227+
228+
# Memory dumps
229+
*.dmp
230+
231+
# Auto-generated files
232+
/src/common/version.cpp
233+
234+
# Doxygen
235+
doxygen/
236+
237+
# Docker
238+
*docker-compose*
239+
!dev.docker-compose.yml
240+
241+
# dSYM folders for Mac OS debugging
242+
xi_map.dSYM
243+
xi_connect.dSYM
244+
xi_search.dSYM
245+
246+
# Keys and Certs
247+
**/*.key
248+
**/*.cert
249+
250+
# Environments
251+
.env
252+
.venv
253+
env/
254+
venv/
255+
ENV/
256+
env.bak/
257+
venv.bak/
258+
259+
# Test artifacts
260+
*.ctrf.json
261+
__pycache__
262+
263+
sanity_checks_summary.md
264+
changed-files.txt
265+
clang_tidy_summary.md

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@ indent_brace_style = allman # This is unfortunately ignored in Visual Studio
7979
# Makefiles actually require the tabs.
8080
[Makefile]
8181
indent_style = tab
82+
83+
[*.yml]
84+
indent_style = space
85+
indent_size = 2

0 commit comments

Comments
 (0)