Skip to content

Commit

Permalink
gitignore refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
martukas committed Nov 3, 2024
1 parent fcecd46 commit e2670a6
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 46 deletions.
46 changes: 13 additions & 33 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,57 +1,37 @@
build/
build_autotests/
.pio/
!.gitignore

# OS
install
source/config/*
.DS_Store
*.app
*.desktop
*.user
*.log
!.gitignore

#IDE
software/controller/CMakeLists*
software/common/CMakeLists*
cmake-build-*/
.idea/
# IDE: VSCode
.vscode

# IDE: JetBrains
.idea
.vscode/
.idea/
CMakeLists.txt.user
cmake-build-*/

# IDE: other
.ctags
ctags
tags
.cscope.out
cscope.out
*~

#CAD/Inventor
*.lck
OldVersions/

.DS_Store
.clangd/
.*.swp
*.map
last_graph.dat

coverage_reports

# KiCAD backups
*.sch-bak
*.kicad_pcb-bak
*.bak
# KiCAD temp/unneeded cache files
_autosave-*
*.000
fp-info-cache
# (project symbol cache library not needed as all symbols kept in RespiraWorks libraries)
*-cache.lib

#performance test data
local_data/
test_data/

#Conan created files
CMakeUserPresets.json

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
14 changes: 9 additions & 5 deletions docs/docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ install_linux() {
install_py
sudo apt update
sudo apt --yes install \
make \
doxygen \
graphviz
sudo apt --yes install apt-transport-https ca-certificates curl software-properties-common
make \
doxygen \
graphviz
sudo apt --yes install \
apt-transport-https \
ca-certificates \
curl \
software-properties-common
curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
| sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
Expand Down Expand Up @@ -86,7 +90,7 @@ launch_browser() {

check_links() {
echo "If you wish to use \`./docs.sh check\` to check validity of links locally, please follow installation instructions at https://github.com/lycheeverse/lychee"
docker run --init --rm -w /input -v "$(pwd)/..":/input lycheeverse/lychee -c ./docs/lychee.toml .
docker run --init --rm -w /input -v "$(pwd)/..":/input lycheeverse/lychee -c ./docs/lychee.toml --no-ignore .
# lychee ..
}

Expand Down
10 changes: 5 additions & 5 deletions docs/lychee.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ exclude = [
'.*\.valispace.com\.*',
'.*\wonsmart-motor.en.made-in-china.com\.*',
'.*\.raspberrypi.com\.*',
'.*\.servoflo.com\.*'
'.*\.servoflo.com\.*',
'.*\.rawgit.com\.*',
]

# Exclude these filesystem paths from getting checked.
exclude_path = [
"../software/common/coverage_reports",
"../software/controller/coverage_reports",
"../software/gui/coverage_reports",
"../software/gui/src/third_party"
"software/common/coverage_reports",
"software/controller/coverage_reports",
"software/gui/coverage_reports",
]

# Exclude all private IPs from checking.
Expand Down
3 changes: 3 additions & 0 deletions manufacturing/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#CAD/Inventor
*.lck
OldVersions/
10 changes: 10 additions & 0 deletions pcb/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# KiCAD backups
*.sch-bak
*.kicad_pcb-bak
*.bak
# KiCAD temp/unneeded cache files
_autosave-*
*.000
fp-info-cache
# (project symbol cache library not needed as all symbols kept in RespiraWorks libraries)
*-cache.lib
2 changes: 2 additions & 0 deletions software/common/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#network protocol output files
generated_libs/protocols/*.c
generated_libs/protocols/*.h
.pio/
coverage_reports/
2 changes: 1 addition & 1 deletion software/common/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ generate_network_protocols() {
mkdir -p "$PYTHON_LIB_PATH"
mkdir -p "$GUI_LIB_PATH"
#ensure old files are gone
rm -f $PROTOCOLS_DIR/*.h $PROTOCOLS_DIR/*.c $GUI_LIB_PATH/*.c* $GUI_LIB_PATH/*.h* $PYTHON_LIB_PATH/*.py
rm -f $PROTOCOLS_DIR/*.h $PROTOCOLS_DIR/*.c $GUI_LIB_PATH/*.c* $GUI_LIB_PATH/*.h* $PYTHON_LIB_PATH/*_pb2.py

protoc \
--plugin="$NANOPB_PLUGIN" \
Expand Down
2 changes: 2 additions & 0 deletions software/controller/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.pio/
coverage_reports/
3 changes: 3 additions & 0 deletions software/controller/controller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ elif [ "$1" == "check" ]; then
elif [ "$1" == "unit" ]; then
clean_all

# generate comms protocols
../common/common.sh generate

if [ -n "$2" ]; then
pio test -e native -f "$2"
else
Expand Down
5 changes: 5 additions & 0 deletions software/gui/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#network protocol output files
src/protocols/*.cc
src/protocols/*.h
build/
coverage_reports/

#Conan created files
CMakeUserPresets.json
2 changes: 0 additions & 2 deletions software/gui/gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ elif [ "$1" == "build" ]; then
ensure_not_root

# generate comms protocols
../common/common.sh update
../common/common.sh generate

config_type="Release"
Expand Down Expand Up @@ -253,7 +252,6 @@ elif [ "$1" == "test" ]; then
ensure_not_root

# generate comms protocols
../common/common.sh update
../common/common.sh generate

j_opt=""
Expand Down

0 comments on commit e2670a6

Please sign in to comment.