Skip to content

Commit b54dd3f

Browse files
committed
fix(deps): add capnp std and mockery
- capnpc-go: v3.1.0-alpha.1 → v3.1.0-alpha.2 - Dockerfile.devel: add mockery v2.53.6 - Makefile: make build depend on gen-build - qemu script: fix || ture typo, add ubuntu20.04 clang-12 workaround
1 parent 8e7d046 commit b54dd3f

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/scripts/qemu-2-run-in-vm.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function print_sys_info() {
4949
df -h
5050

5151
# tool chains
52-
go version || ture
52+
go version || true
5353
go env || true
5454

5555
docker version || true
@@ -116,11 +116,13 @@ function prapre_test_env() {
116116
sudo apt-get update
117117
sudo apt-get install -y "${missing_packages[@]}"
118118
fi
119+
# ubuntu20.04 默认 clang-10 的 CO-RE 重定位有 bug(LLVM 12 / D87153 修复),用 clang-12 遮蔽
120+
[[ "$OS_DISTRO" != "ubuntu20.04" ]] || { sudo apt-get install -y clang-12 && sudo ln -sf /usr/bin/clang-12 /usr/local/bin/clang; }
119121
;;
120122
esac
121123

122124
which mockery || go install github.com/vektra/mockery/v2@latest
123-
which capnpc-go || go install capnproto.org/go/capnp/v3/capnpc-go@v3.1.0-alpha.1
125+
which capnpc-go || go install capnproto.org/go/capnp/v3/capnpc-go@v3.1.0-alpha.2
124126
git config --global --add safe.directory /mnt/host
125127
}
126128

Dockerfile.devel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ ENV PATH="${GOPATH}/bin:${GOROOT}/bin:/usr/lib/llvm15/bin:${PATH}"
1818
RUN go install mvdan.cc/gofumpt@v0.8.0 && \
1919
go install golang.org/x/tools/cmd/goimports@v0.36.0 && \
2020
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 && \
21-
go install capnproto.org/go/capnp/v3/capnpc-go@v3.1.0-alpha.1
21+
go install github.com/vektra/mockery/v2@v2.53.6 && \
22+
go install capnproto.org/go/capnp/v3/capnpc-go@v3.1.0-alpha.2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ sync:
7272
@cp $(BPF_DIR)/*.o $(APP_CMD_OUTPUT)/bpf/
7373
@cp *.conf $(APP_CMD_OUTPUT)/conf/
7474

75-
build: $(APP_CMD_BIN_TARGETS)
75+
build: gen-build $(APP_CMD_BIN_TARGETS)
7676
$(APP_CMD_BIN_TARGETS): $(GO_SRCS)
7777
$(APP_CMD_OUTPUT)/bin/%:
7878
@mkdir -p $(APP_CMD_OUTPUT)/bin

0 commit comments

Comments
 (0)