Skip to content

Commit 05c493a

Browse files
committed
temp
Signed-off-by: Rohit Agrawal <rohit.agrawal@databricks.com>
1 parent 0dc852d commit 05c493a

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

.github/workflows/commit.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ jobs:
120120
load: true
121121
push: false
122122
tags: ghcr.io/${{ github.repository_owner }}/dynamic-modules-examples:${{ github.sha }}
123-
cache-from: type=gha
124-
cache-to: type=gha,mode=max
123+
# Temporarily disable cache for debugging ABI issues
124+
no-cache: true
125125

126126
- uses: actions/setup-go@v5
127127
with:
@@ -159,6 +159,7 @@ jobs:
159159
platforms: linux/amd64,linux/arm64
160160
push: true
161161
tags: ghcr.io/${{ github.repository_owner }}/dynamic-modules-examples:${{ github.sha }},ghcr.io/${{ github.repository_owner }}/dynamic-modules-examples:latest
162+
# Re-enable cache after ABI update is confirmed working
162163
cache-from: type=gha
163164
cache-to: type=gha,mode=max
164165

Dockerfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN cp /build/target/x86_64-unknown-linux-gnu/debug/librust_module.so /build/amd
3131

3232
##### Build the Go library #####
3333

34+
# ABI version updated to v1.37.0 (4dae397a7c9ff0238d318d57ea656ce8b3fbff595787dcd7ee2ff5b79c9fe10f)
35+
3436
# We use zig to cross-compile the Go library for both x86_64 and aarch64 architectures.
3537
FROM --platform=$BUILDPLATFORM golang:1.24.2 AS go_builder
3638
# Install zig.
@@ -42,12 +44,18 @@ RUN curl -L "https://ziglang.org/download/${ZIG_VERSION}/zig-linux-$(uname -m)-$
4244
RUN mkdir /build
4345
COPY ./go /build
4446
WORKDIR /build
45-
RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu" CGO_ENABLED=1 GOARCH=arm64 go build -buildmode=c-shared -o /build/arm64_libgo_module.so .
46-
RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so .
47+
# Show ABI version for debugging
48+
RUN grep "var version = append" /build/gosdk/abi.go || true
49+
RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu" CGO_ENABLED=1 GOARCH=arm64 go build -buildmode=c-shared -o /build/arm64_libgo_module.so . && \
50+
ls -la /build/arm64_libgo_module.so
51+
RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so . && \
52+
ls -la /build/amd64_libgo_module.so
4753

4854
##### Build the final image #####
4955
FROM envoyproxy/envoy:v1.37.0 AS envoy
5056
ARG TARGETARCH
5157
ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib
5258
COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so
5359
COPY --from=go_builder /build/${TARGETARCH}_libgo_module.so /usr/local/lib/libgo_module.so
60+
# Verify modules are present
61+
RUN ls -la /usr/local/lib/lib*.so

0 commit comments

Comments
 (0)