Merge branch 'main' into becca/attach-console

kolide · Nov 3, 2023 · ed75fe9 · ed75fe9
2 parents 33c1089 + 9aed079
commit ed75fe9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 164 deletions.
diff --git a/Makefile b/Makefile
@@ -75,7 +75,6 @@ build/darwin.%/Kolide.app: build/darwin.%/launcher
 # pointers, mostly for convenience reasons
 launcher: build_launcher
 tables.ext: build_tables.ext
-grpc.ext: build_grpc.ext
 fake-launcher: fake_launcher
 build/darwin.amd64/%: build_%_darwin_amd64
 build/darwin.arm64/%: build_%_darwin_arm64
@@ -84,7 +83,7 @@ build/darwin.universal/%: lipo_%
 ##
 ## GitHub Action Helpers
 ##
-GITHUB_TARGETS=launcher grpc.ext tables.ext package-builder
+GITHUB_TARGETS=launcher tables.ext package-builder
 GITHUB_ARCHS=amd64 arm64
 github-build: $(foreach t, $(GITHUB_TARGETS), $(foreach a, $(GITHUB_ARCHS), build_$(t)_noop_$(a)))
 github-lipo: $(foreach t, $(GITHUB_TARGETS), lipo_$(t))

diff --git a/cmd/grpc.ext/grpc.go b/cmd/grpc.ext/grpc.go