Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: docker ci #147

Merged
merged 2 commits into from
Aug 19, 2024
Merged

fix: docker ci #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de52fb6
fix: docker ci
JoowonYun Aug 19, 2024
e0fd05c
fix: integration on case
JoowonYun Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/integration-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: End-to-end test

on:
push:
branches: [ "main", "cube", "tesseract", "release/*" ]
branches: [ "main", "cube", "release/**" ]
pull_request:
branches: [ "*" ]
types: [opened, reopened]

jobs:

Expand All @@ -17,7 +17,7 @@ jobs:
- name: Setup network
run: |
mkdir ~/genesis
cd tests/e2e && docker-compose up -d
cd tests/e2e && docker compose up -d
docker ps
sleep 20

Expand All @@ -30,4 +30,4 @@ jobs:
run: cd tests/e2e && go test

- name: Teardown
run: cd tests/e2e && docker-compose down
run: cd tests/e2e && docker compose down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ GO_VERSION ?= "1.19"

# for dockerized protobuf tools
DOCKER := $(shell which docker)
DOCKER_COMPOSE := $(shell which docker-compose)
BUF_IMAGE=bufbuild/buf@sha256:3cb1f8a4b48bd5ad8f09168f10f607ddc318af202f5c057d52a45216793d85e5 #v1.4.0
DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(BUF_IMAGE)

Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This module is basically for the automated end-to-end test. But if you want to e
```bash
# 1. From the repo root, move to the tests/e2e, and execute docker compose
cd tests/e2e
docker-compose up -d
docker compose up -d

# 2. Wait for building. Once done without error, you may check the nodes running
docker ps
Expand All @@ -34,7 +34,7 @@ go test
# ok github.com/xpladev/xpla/tests/e2e 29.365s

# If you see the pass sign, you may down the nodes
docker-compose down
docker compose down
```

## Test scenario
Expand Down
Loading