Skip to content

Commit e784c38

Browse files
pthmaspthmas
committed
fix ci
1 parent c4586e3 commit e784c38

File tree

7 files changed

+44
-19
lines changed

7 files changed

+44
-19
lines changed

‎.github/workflows/integration_test.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ 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
26-
EVNODE_VERSION: v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
25+
IGNITE_EVOLVE_APP_VERSION: 097513a38337
26+
EVNODE_VERSION: v0.0.0-20251216132820-afcd6bd9b354
2727
steps:
2828
- uses: actions/checkout@v5
2929

@@ -63,9 +63,9 @@ jobs:
6363
runs-on: ubuntu-latest
6464
timeout-minutes: 30
6565
env:
66-
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
66+
EVNODE_VERSION: "v0.0.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

@@ -106,9 +106,9 @@ jobs:
106106
timeout-minutes: 30
107107
env:
108108
DO_NOT_TRACK: true
109-
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
109+
EVNODE_VERSION: "v0.0.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
@@ -313,7 +319,7 @@ jobs:
313319
GMD_HOME: ${{ needs.liveness.outputs.gmd_home }}
314320
HERMES_VERSION: "v1.13.1"
315321
GAIA_VERSION: "v25.1.0"
316-
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
322+
EVNODE_VERSION: "v0.0.0-20251216132820-afcd6bd9b354"
317323
steps:
318324
- name: Set up Go
319325
uses: actions/setup-go@v6
@@ -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 &
@@ -540,7 +549,7 @@ jobs:
540549
timeout-minutes: 30
541550
env:
542551
DO_NOT_TRACK: true
543-
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
552+
EVNODE_VERSION: "v0.0.0-20251216132820-afcd6bd9b354"
544553
IGNITE_VERSION: "v29.6.1"
545554
IGNITE_EVOLVE_APP_VERSION: "main"
546555
GAIA_VERSION: "v25.1.0"

‎.github/workflows/migration_test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ permissions:
1212
actions: write
1313

1414
env:
15-
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
15+
EVNODE_VERSION: "v0.0.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: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
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 \
67
libc6-compat \
78
curl \
8-
bash
9+
bash \
10+
git
911

1012
# Set environment variables
11-
ENV EVNODE_VERSION=v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
13+
ENV EVNODE_VERSION=v0.0.0-20251216132820-afcd6bd9b354
1214
ENV IGNITE_VERSION=v29.6.1
13-
ENV IGNITE_EVOLVE_APP_VERSION=main
15+
ENV IGNITE_EVOLVE_APP_VERSION=${IGNITE_EVOLVE_APP_VERSION}
1416

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

@@ -27,7 +29,11 @@ RUN ignite app install github.com/ignite/apps/evolve@${IGNITE_EVOLVE_APP_VERSION
2729
ignite evolve add-migrate
2830

2931
RUN go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@${EVNODE_VERSION} && \
32+
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@${EVNODE_VERSION} && \
33+
go mod edit -replace github.com/evstack/ev-node/execution/grpc=github.com/evstack/ev-node/execution/grpc@${EVNODE_VERSION} && \
34+
go mod edit -replace github.com/evstack/ev-node/execution/evm=github.com/evstack/ev-node/execution/evm@${EVNODE_VERSION} && \
3035
go mod edit -replace github.com/evstack/ev-abci=/workspace/ev-abci && \
36+
go mod edit -replace github.com/quic-go/quic-go=github.com/quic-go/quic-go@v0.57.1 && \
3137
go mod tidy && \
3238
go mod download
3339

‎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

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.0
44

55
// TODO: remove after https://github.com/evstack/ev-node/pull/2797
66
replace (
7-
github.com/evstack/ev-node => github.com/evstack/ev-node v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
7+
github.com/evstack/ev-node => github.com/evstack/ev-node v0.0.0-20251216132820-afcd6bd9b354
88
github.com/evstack/ev-node/core => github.com/evstack/ev-node/core v1.0.0-beta.5.0.20251216132820-afcd6bd9b354
99
)
1010

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
284284
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
285285
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
286286
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
287-
github.com/evstack/ev-node v1.0.0-beta.10.0.20251216132820-afcd6bd9b354 h1:KT4rm4DvZ0v1kWaCTYgiJNw4neI03HBxWTERp73rs18=
288-
github.com/evstack/ev-node v1.0.0-beta.10.0.20251216132820-afcd6bd9b354/go.mod h1:ND2OqaaSPulfplFLynk3ynXyilORRjBXp6YEpeKHOH8=
287+
github.com/evstack/ev-node v0.0.0-20251216132820-afcd6bd9b354 h1:F9PhXXatdexk3MJvmty4ZJ6vatROuuwMx6HeG+GpUQ8=
288+
github.com/evstack/ev-node v0.0.0-20251216132820-afcd6bd9b354/go.mod h1:ND2OqaaSPulfplFLynk3ynXyilORRjBXp6YEpeKHOH8=
289289
github.com/evstack/ev-node/core v1.0.0-beta.5.0.20251216132820-afcd6bd9b354 h1:OxOxcl277IkpkZ1tmm/FWfdy72xrjOOOzLGyXzL5z2A=
290290
github.com/evstack/ev-node/core v1.0.0-beta.5.0.20251216132820-afcd6bd9b354/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
291291
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=

‎tests/integration/docker/Dockerfile.gm‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
FROM golang:1.25-bookworm AS builder
55

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

1010
RUN apt-get update && apt-get install -y --no-install-recommends \
1111
git curl bash ca-certificates make gcc musl-dev && \
@@ -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)