fx build fix
Some checks failed
ci/woodpecker/push/db Pipeline was successful
ci/woodpecker/push/fx/1 Pipeline failed
ci/woodpecker/push/fx/2 Pipeline failed
ci/woodpecker/push/nats Pipeline was successful

This commit is contained in:
Stephan D
2025-11-08 03:40:49 +01:00
parent 5c73106044
commit 0f8737a906
2 changed files with 9 additions and 20 deletions

View File

@@ -34,14 +34,18 @@ steps:
"$GIT_REV" "$BUILD_BRANCH" "$APP_V" "$BUILD_DATE" "$BUILD_USER" | tee .env.version
- name: proto
image: golang:latest
image: golang:alpine
depends_on: [ version ]
commands:
- set -eu
- if set -o | grep -q pipefail; then set -o pipefail; fi
- apt-get update >/dev/null
- DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends protobuf-compiler >/dev/null
- rm -rf /var/lib/apt/lists/*
- apk add --no-cache \
bash \
git \
build-base \
protobuf \
protobuf-dev \
protoc
- go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
- go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
- export PATH="$(go env GOPATH)/bin:$PATH"

View File

@@ -7,22 +7,7 @@ REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
API_DIR="${REPO_ROOT}/api"
PROTO_DIR="./proto"
PROTOC_BIN="${PROTOC:-protoc}"
PROTOC_INCLUDE="${PROTOC_INCLUDE:-}"
if [ -z "${PROTOC_INCLUDE}" ]; then
PROTOC_INCLUDE="$("${PROTOC_BIN}" --print_include_path 2>/dev/null || true)"
fi
if [ -z "${PROTOC_INCLUDE}" ] || [ ! -f "${PROTOC_INCLUDE}/google/protobuf/timestamp.proto" ]; then
for candidate in /usr/include /usr/local/include /usr/lib/include /usr/local/share/include "$(dirname "${PROTOC_BIN}")/../include"; do
if [ -f "${candidate}/google/protobuf/timestamp.proto" ]; then
PROTOC_INCLUDE="${candidate}"
break
fi
done
fi
if [ -z "${PROTOC_INCLUDE}" ] || [ ! -f "${PROTOC_INCLUDE}/google/protobuf/timestamp.proto" ]; then
echo "[proto] failed to locate google/protobuf well-known types; set PROTOC_INCLUDE" >&2
exit 1
fi
PROTOC_INCLUDE="$("${PROTOC_BIN}" --print_include_path 2>/dev/null)"
if ! command -v "${PROTOC_BIN}" >/dev/null 2>&1; then
echo "[proto] protoc binary not found" >&2