enforce buf v1.25.0

aurae-runtime · Aug 8, 2023 · e774d94 · e774d94
1 parent 082339c
commit e774d94
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/001-tester-ubuntu-make-test.yml b/.github/workflows/001-tester-ubuntu-make-test.yml
@@ -55,6 +55,7 @@ jobs:
       - uses: bufbuild/buf-setup-action@v1
         with:
           github_token: ${{ github.token }}
+          version: 1.25.0
       - uses: actions/cache@v3
         with:
           path: |

diff --git a/Makefile b/Makefile
@@ -174,8 +174,10 @@ GEN_RS += $(patsubst api/v0/%,$(GEN_TONIC_RS_PATTERN),$(PROTO_DIRS))
 
 GEN_TS = $(patsubst api/v0/%.proto,$(GEN_TS_PATTERN),$(PROTOS))
 
+BUF_VERSION = $(shell buf --version)
+
 $(GEN_TS_PATTERN) $(GEN_RS_PATTERN) $(GEN_SERDE_RS_PATTERN) $(GEN_TONIC_RS_PATTERN): $(PROTOS)
-	@buf --version >/dev/null 2>&1 || (echo "Warning: buf is not installed! Please install the 'buf' command line tool: https://docs.buf.build/installation"; exit 1)
+	@if [[ "${BUF_VERSION}" != "1.25.0" ]]; then echo "Warning: buf 1.25.0 is not installed! Please install v1.25.0 of the 'buf' command line tool: https://docs.buf.build/installation"; exit 1; fi;
 	buf lint api
 	buf generate -v api
 

diff --git a/images/Dockerfile.build b/images/Dockerfile.build
@@ -40,7 +40,7 @@ LABEL org.opencontainers.image.source https://github.com/aurae-runtime/aurae
 
 ## Define ARGs
 ARG CACHE_VERSION=v0
-ARG BUF_VERSION=1.11.0
+ARG BUF_VERSION=1.25.0
 ARG PROTOC_VERSION=1.5.1
 ARG GH_CLI_VERSION=2.21.2
 
@@ -68,7 +68,7 @@ RUN  apt-get update && \
     git \
     make \
     musl-tools \
-    protobuf-compiler 
+    protobuf-compiler
 RUN rm -rf /var/lib/apt/lists/*
 
 ## Setup Rust

diff --git a/images/Dockerfile.nested b/images/Dockerfile.nested
@@ -35,7 +35,7 @@ LABEL org.opencontainers.image.source https://github.com/aurae-runtime/aurae
 
 ## Define ARGs
 ARG CACHE_VERSION=v0
-ARG BUF_VERSION=1.11.0
+ARG BUF_VERSION=1.25.0
 ARG VALE_VERSION=2.21.3
 ARG PROTOC_VERSION=1.5.1
 

diff --git a/images/Dockerfile.test b/images/Dockerfile.test
@@ -40,7 +40,7 @@ LABEL org.opencontainers.image.source https://github.com/aurae-runtime/aurae
 
 ## Define ARGs
 ARG CACHE_VERSION=v0
-ARG BUF_VERSION=1.11.0
+ARG BUF_VERSION=1.25.0
 ARG VALE_VERSION=2.21.3
 ARG PROTOC_VERSION=1.5.1
 
@@ -88,4 +88,4 @@ RUN curl -sSl -J -L "https://github.com/errata-ai/vale/releases/download/v${VALE
 RUN cargo install cargo-udeps
 RUN cargo install cargo-deny
 
-WORKDIR /aurae
+WORKDIR /aurae