Clean-up bridge launching in CI (#3047)

* Simplfy bridge scripts * update * update
litentry · Sep 6, 2024 · bbaa61e · bbaa61e
1 parent 82fe52a
commit bbaa61e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 26 deletions.
diff --git a/.github/file-filter.yml b/.github/file-filter.yml
@@ -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

diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ tags.lock
 recipe.json
 rococo-fork.json
 
-gethdata
+**/gethdata/
 
 *.patch
 /log

diff --git a/Makefile b/Makefile
@@ -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

diff --git a/scripts/build-bridge-docker.sh → scripts/build-bridge.sh b/scripts/build-bridge-docker.sh → scripts/build-bridge.sh
diff --git a/scripts/launch-local-bridge-docker.sh → scripts/launch-bridge.sh b/scripts/launch-local-bridge-docker.sh → scripts/launch-bridge.sh
@@ -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 "------------------------------------------------------------"

diff --git a/scripts/launch-local-bridge-binary.sh b/scripts/launch-local-bridge-binary.sh
diff --git a/scripts/run-ts-test.sh b/scripts/run-ts-test.sh
@@ -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