Skip to content

Commit c35f216

Browse files
committed
fix ci
1 parent c4586e3 commit c35f216

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

.github/workflows/integration_test.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
image_tag: ${{ steps.tag.outputs.tag }}
2323
env:
2424
IGNITE_VERSION: v29.3.0 # the gm build script depends on some annotations
25-
IGNITE_EVOLVE_APP_VERSION: main
25+
IGNITE_EVOLVE_APP_VERSION: 097513a38337
2626
EVNODE_VERSION: v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
2727
steps:
2828
- uses: actions/checkout@v5
@@ -65,7 +65,7 @@ jobs:
6565
env:
6666
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
6767
IGNITE_VERSION: "v29.6.1"
68-
IGNITE_EVOLVE_APP_VERSION: "main"
68+
IGNITE_EVOLVE_APP_VERSION: "097513a38337"
6969
EVOLVE_IMAGE_REPO: "evolve-gm"
7070
EVOLVE_IMAGE_TAG: "latest"
7171

@@ -108,7 +108,7 @@ jobs:
108108
DO_NOT_TRACK: true
109109
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
110110
IGNITE_VERSION: "v29.6.1"
111-
IGNITE_EVOLVE_APP_VERSION: "main"
111+
IGNITE_EVOLVE_APP_VERSION: "097513a38337"
112112
outputs:
113113
carol_mnemonic: ${{ steps.save_mnemonic.outputs.carol_mnemonic }}
114114
gmd_home: ${{ steps.paths.outputs.GMD_HOME }}
@@ -161,10 +161,16 @@ jobs:
161161
162162
# replace the github.com/evstack/ev-node module with tagged version
163163
go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@$EVNODE_VERSION
164+
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@$EVNODE_VERSION
165+
go mod edit -replace github.com/evstack/ev-node/execution/grpc=github.com/evstack/ev-node/execution/grpc@$EVNODE_VERSION
166+
go mod edit -replace github.com/evstack/ev-node/execution/evm=github.com/evstack/ev-node/execution/evm@$EVNODE_VERSION
164167
165168
# replace the github.com/evstack/ev-abci module with the local version
166169
go mod edit -replace github.com/evstack/ev-abci=$GO_EXECUTION_ABCI_DIR
167170
171+
# force modern quic-go so webtransport-go builds cleanly
172+
go mod edit -replace github.com/quic-go/quic-go=github.com/quic-go/quic-go@v0.57.1
173+
168174
# download dependencies and update go.mod/go.sum
169175
go mod tidy
170176
@@ -360,6 +366,9 @@ jobs:
360366
cd /tmp/da-tool
361367
go mod init temp
362368
go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@$EVNODE_VERSION
369+
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@$EVNODE_VERSION
370+
go mod edit -replace github.com/evstack/ev-node/execution/grpc=github.com/evstack/ev-node/execution/grpc@$EVNODE_VERSION
371+
go mod edit -replace github.com/evstack/ev-node/execution/evm=github.com/evstack/ev-node/execution/evm@$EVNODE_VERSION
363372
go get github.com/evstack/ev-node/tools/local-da
364373
# start the local da in the background
365374
go tool github.com/evstack/ev-node/tools/local-da &

.github/workflows/migration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
env:
1515
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
1616
IGNITE_VERSION: "v29.6.1"
17-
IGNITE_EVOLVE_APP_VERSION: "main"
17+
IGNITE_EVOLVE_APP_VERSION: "097513a38337"
1818
EVOLVE_IMAGE_REPO: "ghcr.io/evstack/evolve-abci-gm"
1919
COSMOS_SDK_IMAGE_REPO: "ghcr.io/evstack/cosmos-sdk-gm"
2020

Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM golang:1.25-alpine AS ignite-builder
22
ARG ENABLE_IBC=true
3+
ARG IGNITE_EVOLVE_APP_VERSION=097513a38337
34

45
# Install dependencies needed for ignite and building
56
RUN apk add --no-cache \
@@ -10,7 +11,7 @@ RUN apk add --no-cache \
1011
# Set environment variables
1112
ENV EVNODE_VERSION=v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
1213
ENV IGNITE_VERSION=v29.6.1
13-
ENV IGNITE_EVOLVE_APP_VERSION=main
14+
ENV IGNITE_EVOLVE_APP_VERSION=${IGNITE_EVOLVE_APP_VERSION}
1415

1516
RUN curl -sSL https://get.ignite.com/cli@${IGNITE_VERSION}! | bash
1617

@@ -27,7 +28,11 @@ RUN ignite app install github.com/ignite/apps/evolve@${IGNITE_EVOLVE_APP_VERSION
2728
ignite evolve add-migrate
2829

2930
RUN go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@${EVNODE_VERSION} && \
31+
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@${EVNODE_VERSION} && \
32+
go mod edit -replace github.com/evstack/ev-node/execution/grpc=github.com/evstack/ev-node/execution/grpc@${EVNODE_VERSION} && \
33+
go mod edit -replace github.com/evstack/ev-node/execution/evm=github.com/evstack/ev-node/execution/evm@${EVNODE_VERSION} && \
3034
go mod edit -replace github.com/evstack/ev-abci=/workspace/ev-abci && \
35+
go mod edit -replace github.com/quic-go/quic-go=github.com/quic-go/quic-go@v0.57.1 && \
3136
go mod tidy && \
3237
go mod download
3338

Dockerfile.cosmos-sdk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM golang:1.25-alpine AS ignite-builder
22
ARG ENABLE_IBC=true
3+
ARG IGNITE_EVOLVE_APP_VERSION=097513a38337
34

45
# Install dependencies needed for ignite and building
56
RUN apk add --no-cache \
@@ -10,6 +11,7 @@ RUN apk add --no-cache \
1011

1112
# Set environment variables
1213
ENV IGNITE_VERSION=v29.5.0
14+
ENV IGNITE_EVOLVE_APP_VERSION=${IGNITE_EVOLVE_APP_VERSION}
1315

1416
RUN curl -sSL https://get.ignite.com/cli@${IGNITE_VERSION}! | bash
1517

@@ -20,7 +22,11 @@ RUN ignite scaffold chain gm --no-module --skip-git --address-prefix gm
2022

2123
WORKDIR /workspace/gm
2224

23-
RUN ignite app install -g github.com/ignite/apps/evolve@main
25+
RUN ignite app install -g github.com/ignite/apps/evolve@${IGNITE_EVOLVE_APP_VERSION}
26+
27+
# ensure modern quic-go so webtransport-go builds cleanly
28+
RUN go mod edit -replace github.com/quic-go/quic-go=github.com/quic-go/quic-go@v0.57.1 && \
29+
go mod tidy
2430

2531
# Add only the evolve migrate command (do not scaffold full evolve integration)
2632
RUN ignite evolve add-migrate

tests/integration/docker/Dockerfile.gm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
FROM golang:1.25-bookworm AS builder
55

66
ARG IGNITE_VERSION=v29.3.1
7-
ARG IGNITE_EVOLVE_APP_VERSION=main
7+
ARG IGNITE_EVOLVE_APP_VERSION=097513a38337
88
ARG EVNODE_VERSION=v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
99

1010
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -33,7 +33,11 @@ RUN chmod +x /workspace/patch-app-wiring.sh && \
3333

3434
# Align module versions like in CI
3535
RUN go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@${EVNODE_VERSION} \
36+
&& go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@${EVNODE_VERSION} \
37+
&& go mod edit -replace github.com/evstack/ev-node/execution/grpc=github.com/evstack/ev-node/execution/grpc@${EVNODE_VERSION} \
38+
&& go mod edit -replace github.com/evstack/ev-node/execution/evm=github.com/evstack/ev-node/execution/evm@${EVNODE_VERSION} \
3639
&& go mod edit -replace github.com/evstack/ev-abci=../ev-abci \
40+
&& go mod edit -replace github.com/quic-go/quic-go=github.com/quic-go/quic-go@v0.57.1 \
3741
&& go mod tidy
3842

3943
# Build gmd binary

0 commit comments

Comments
 (0)