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

Clean-up bridge launching in CI #3047

Merged
merged 5 commits into from
Sep 6, 2024
Merged

Clean-up bridge launching in CI #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07e168b
Simplfy bridge scripts
Kailai-Wang Sep 5, 2024
9218b8e
update
Kailai-Wang Sep 5, 2024
ad2a50e
update
Kailai-Wang Sep 5, 2024
7d0911d
Merge branch 'dev' into simplify-bridge-in-ci
Kailai-Wang Sep 6, 2024
9d45398
Merge branch 'dev' into simplify-bridge-in-ci
Kailai-Wang Sep 6, 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
6 changes: 3 additions & 3 deletions .github/file-filter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ parachain_src: &parachain_src
parachain_test: &parachain_test
- 'ts-tests/**'
- 'docker/**'
- 'scripts/build-bridge-docker.sh'
- 'scripts/launch-local-docker.sh'
- 'scripts/launch-local-bridge-docker.sh'
- 'scripts/build-bridge.sh'
- 'scripts/launch-network.sh'
- 'scripts/launch-bridge.sh'

coverage_src: &coverage_src
- *parachain_src
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags.lock
recipe.json
rococo-fork.json

gethdata
**/gethdata/

*.patch
/log
Expand Down
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ launch-network-rococo:
launch-network-litentry:
@./scripts/launch-network.sh litentry

.PHONY: launch-docker-bridge
launch-docker-bridge:
@./scripts/launch-local-bridge-docker.sh

# run tests

.PHONY: test-cargo-all ## cargo test --all
Expand Down
0 scripts/build-bridge-docker.sh → scripts/build-bridge.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/launch-local-bridge-docker.sh → scripts/launch-bridge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ROOTDIR=$(git rev-parse --show-toplevel)

if [[ "$(docker image inspect litentry/chainbridge:latest 2>/dev/null)" == "[]" ]]; then
echo "litentry/chainbridge:latest image not found..."
${ROOTDIR}/scripts/build-bridge-docker.sh
${ROOTDIR}/scripts/build-bridge.sh
fi

echo "------------------------------------------------------------"
Expand Down
12 changes: 0 additions & 12 deletions scripts/launch-local-bridge-binary.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions scripts/run-ts-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:-"/tmp/parachain_dev"}

[ -f .env ] || echo "NODE_ENV=ci" >.env
pnpm install
pnpm run test-filter 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-filter 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"

if $bridge; then
$ROOTDIR/scripts/launch-local-bridge-docker.sh
$ROOTDIR/scripts/launch-bridge.sh
pnpm run test-bridge 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
fi

if $evm; then
pnpm run test-evm-transfer 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-evm-contract 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-precompile-contract 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-evm-transfer 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-evm-contract 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-precompile-contract 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
fi
Loading