Merge branch 'main' into james/exclude-launcher-db-from-time-machine

kolide · Jan 10, 2024 · 0f77084 · 0f77084
2 parents 7b5be2d + db7106f
commit 0f77084
Show file tree

Hide file tree

Showing 39 changed files with 129 additions and 1,713 deletions.
diff --git a/Makefile b/Makefile
@@ -218,8 +218,6 @@ package-builder: .pre-build deps
 
 package-builder-windows: .pre-build deps
 	go run cmd/make/make.go -targets=package-builder -linkstamp --os windows
-launcher-pummel:
-	go run cmd/make/make.go -targets=launcher-pummel
 
 deps-go:
 	go run cmd/make/make.go -targets=deps-go,install-tools

diff --git a/cmd/launcher-pummel/README.md b/cmd/launcher-pummel/README.md
diff --git a/cmd/launcher-pummel/launcher-pummel.go b/cmd/launcher-pummel/launcher-pummel.go