Skip to content

Commit c9e495f

Browse files
committed
fix: garbling cloning
1 parent 0179778 commit c9e495f

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.github/actions/setup-dkls23/action.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ runs:
3030
3131
# Clone dkls23-rs repository
3232
git clone --depth 1 https://${CI_DKLS_GARBLING}@github.com/pushchain/dkls23-rs.git ../dkls23-rs
33+
34+
# Clone garbling repository (dkls23-rs dependency)
35+
git clone --depth 1 https://${CI_DKLS_GARBLING}@github.com/pushchain/garbling.git ../garbling

.github/workflows/interchaintest-e2e.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@ jobs:
6161
go mod download
6262
cd interchaintest && go mod download
6363
64-
- name: Copy dkls23-rs into build context
64+
- name: Copy dkls23-rs and garbling into build context
6565
run: |
6666
# Copy dkls23-rs into the repository so it's available in Docker build context
6767
cp -r ../dkls23-rs ./dkls23-rs
68+
# Copy garbling into the repository so it's available in Docker build context
69+
cp -r ../garbling ./garbling
6870
# Update go.mod replace directive to use ./dkls23-rs for Docker build
6971
sed -i 's|go-wrapper => ../dkls23-rs/wrapper/go-wrappers|go-wrapper => ./dkls23-rs/wrapper/go-wrappers|' go.mod
7072

Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
2323

2424
WORKDIR /code
2525

26-
# Copy dkls23-rs first (needed for go.mod replace directive)
26+
# Copy dkls23-rs and garbling first (needed for go.mod replace directive and Cargo build)
2727
COPY dkls23-rs ./dkls23-rs
28+
COPY garbling ./garbling
29+
30+
# Patch Cargo.toml to use local garbling path instead of git
31+
RUN if [ -f ./dkls23-rs/Cargo.toml ]; then \
32+
# Replace git dependency with local path (relative path from dkls23-rs to garbling)
33+
sed -i 's|hd-migration = { git = "https://github.com/pushchain/garbling.git", branch = "main" }|hd-migration = { path = "../garbling/crates/hd-migration" }|' ./dkls23-rs/Cargo.toml; \
34+
fi
2835

2936
# Download go modules + wasmvm static library
3037
ADD go.mod go.sum ./

0 commit comments

Comments
 (0)