Skip to content

Commit 04b4c7e

Browse files
committed
fix: add capnp.go to avoid installing capnp-go in Dockerfile
1 parent fd4d117 commit 04b4c7e

4 files changed

Lines changed: 476 additions & 10 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
*.o
2-
*.capnp.go
32
_output/
43
cmd/**/bin/
54
**/mock_*_test.go

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ENV PATH=$PATH:/usr/lib/llvm15/bin
1414
COPY . .
1515
RUN set -x; \
1616
apt-get update && apt-get install -y --no-install-recommends \
17-
make clang libbpf-dev bpftool curl git binutils-gold musl-tools capnproto-dev &&\
17+
make clang libbpf-dev bpftool curl git binutils-gold musl-tools &&\
1818
make BUILD_MODE=${BUILD_MODE} &&\
1919
mkdir -p ${RUN_PATH} &&\
2020
cp -rf ${BUILD_PATH}/_output/* ${RUN_PATH}/ &&\

Makefile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ IMAGE := $(IMAGE_REPO):$(IMAGE_TAG)
4949

5050
BPF_BUILD_STAMP := $(APP_CMD_OUTPUT)/.bpf-build-stamp
5151

52-
all: gen-build bpf-build build sync
52+
all: bpf-build build sync
5353

5454
build-nostatic:
5555
@$(MAKE) BUILD_MODE=nostatic all
@@ -72,7 +72,7 @@ sync:
7272
@cp $(BPF_DIR)/*.o $(APP_CMD_OUTPUT)/bpf/
7373
@cp *.conf $(APP_CMD_OUTPUT)/conf/
7474

75-
build: gen-build $(APP_CMD_BIN_TARGETS)
75+
build: $(APP_CMD_BIN_TARGETS)
7676
$(APP_CMD_BIN_TARGETS): $(GO_SRCS)
7777
$(APP_CMD_OUTPUT)/bin/%:
7878
@mkdir -p $(APP_CMD_OUTPUT)/bin
@@ -100,8 +100,7 @@ import-fmt:
100100
$(FIND_EXCLUDE_PATHS) \
101101
-exec shfmt -i 0 -w {} \;
102102

103-
golangci-lint: gen-build
104-
@# gen-build ensures mock/capnp files exist for typecheck to resolve imports.
103+
golangci-lint: mock-build
105104
@golangci-lint run -v ./... --timeout=5m --config .golangci.yaml
106105

107106
vendor:
@@ -113,20 +112,24 @@ clean:
113112
$(FIND_EXCLUDE_PATHS) \
114113
-delete
115114

116-
gen-build:
115+
mock-build:
117116
@go generate -run "mockery.*" -x ./...
117+
118+
# Run manually after editing *.capnp; CI never invokes this so capnp
119+
# toolchain drift in the dev image cannot break `make check`.
120+
capnp-build:
118121
@go generate -run "capnp.*" ./...
119122

120123
test: unit integration e2e
121124

122-
unit: bpf-build gen-build
125+
unit: bpf-build mock-build
123126
@go test -v ./... -coverprofile=$(APP_CMD_OUTPUT)/unit-coverage.txt -timeout=5m
124127
@go tool cover -html=$(APP_CMD_OUTPUT)/unit-coverage.txt -o $(APP_CMD_OUTPUT)/unit-coverage.html
125128

126-
integration: all gen-build
129+
integration: all mock-build
127130
@bash integration/run.sh
128131

129132
e2e: all
130133
@bash e2e/run.sh
131134

132-
.PHONY: all build-nostatic bpf-build gen-build sync build check import-fmt golangci-lint vendor clean test unit integration e2e docker-build docker-clean
135+
.PHONY: all build-nostatic bpf-build mock-build capnp-build sync build check import-fmt golangci-lint vendor clean test unit integration e2e docker-build docker-clean

0 commit comments

Comments
 (0)