From 26a318a8efb7f9765290bfbdacbc986efff9031b Mon Sep 17 00:00:00 2001 From: PJ Date: Tue, 2 Jun 2026 09:09:17 +0530 Subject: [PATCH] fix(build): point sidecar jar ignore and embed paths at sidecarassets --- .gitignore | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f9bd4f..128829e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ node_modules/ # Sidecar fat JAR. Build artifact copied in by `make sanderling` before # `go build -tags withsidecar`. Never commit: it's ~130 MB. -internal/sidecar/assets/sidecar-all.jar +internal/sidecarassets/assets/sidecar-all.jar # spec-api compiled output pkg/spec/dist/ diff --git a/Makefile b/Makefile index e252a0a..e7733a1 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ BUF := buf GO_PACKAGES := ./... SIDECAR_JAR := sidecar/build/libs/sidecar-all.jar -SIDECAR_EMBED := internal/sidecar/assets/sidecar-all.jar +SIDECAR_EMBED := internal/sidecarassets/assets/sidecar-all.jar SIDECAR_SRC := $(shell find sidecar/src -type f \( -name '*.kt' -o -name '*.kts' \) 2>/dev/null) build.gradle.kts settings.gradle.kts SANDERLING_BIN := bin/sanderling