From c9ff2aaddbde98a3e91042e0422df5888c6672c3 Mon Sep 17 00:00:00 2001 From: spacewander Date: Thu, 18 Jan 2024 13:48:28 +0800 Subject: [PATCH] pin dev dependencies This avoid issue like https://github.com/llvm/llvm-project/issues/60627 Signed-off-by: spacewander --- Makefile | 2 +- plugins/casbin/config.proto | 5 ++++- tools/Dockerfile.dev | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 31311a82..b49cc733 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ BUILD_IMAGE ?= golang:1.21-bullseye # to get the sha256 ID PROXY_IMAGE ?= envoyproxy/envoy@sha256:08a498a45afc12b593dd415f6c91b401c35aff119190fc6d549c1873082bf463 # We may need to use timestamp if we need to update the image in one PR -DEV_TOOLS_IMAGE ?= ghcr.io/mosn/htnn-dev-tools:2024-01-05 +DEV_TOOLS_IMAGE ?= ghcr.io/mosn/htnn-dev-tools:2024-01-18 VERSION = $(shell cat VERSION) GIT_VERSION = $(shell git log -1 --pretty=format:%h) diff --git a/plugins/casbin/config.proto b/plugins/casbin/config.proto index 7d7442b3..ee4e0c3e 100644 --- a/plugins/casbin/config.proto +++ b/plugins/casbin/config.proto @@ -28,7 +28,10 @@ message Config { Rule rule = 1 [(validate.rules).message.required = true]; - enum Source { header = 0; } + enum Source { + HEADER = 0; + } + message Token { Source source = 1; string name = 2 [(validate.rules).string = {min_len: 1}]; diff --git a/tools/Dockerfile.dev b/tools/Dockerfile.dev index c0037755..6b6d898c 100644 --- a/tools/Dockerfile.dev +++ b/tools/Dockerfile.dev @@ -25,7 +25,7 @@ ARG GOPROXY ENV GOPROXY=$GOPROXY # codespell -RUN apt update && apt install -y --no-install-recommends pip && pip install codespell +RUN apt update && apt install -y --no-install-recommends pip && pip install codespell==2.2.6 # protoc RUN apt install -y --no-install-recommends unzip @@ -57,4 +57,4 @@ RUN VER=24.4 && \ go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0 # clang-format -RUN apt install -y --no-install-recommends clang-format +RUN pip install clang-format==17.0.6