Skip to content

Commit

Permalink
Minor adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
popzxc committed Oct 28, 2020
1 parent c501b00 commit 86d4754
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ jobs:
run: zksync init

- name: integration-tests
run: |
f cargo build --bin zksync_server --release
f cargo build --bin dummy_prover --release
f cargo build --bin dev-ticker-server --release
ci_docker_container.sh "all_integration_tests.sh || cat_logs.sh"
run: ci_docker_container.sh "all_integration_tests.sh || cat_logs.sh"

- name: integration-testkit
run: zksync integration-testkit
Expand Down
2 changes: 1 addition & 1 deletion bin/ci_docker_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# `entrypoint.sh` prepares database and network for interaction, and also launches `dev-ticker-server`, `server` and `dummy-prover`.
# Note that contracts must be compiled and dummy-prover should be enabled prior to the command launch, as we mount $ZKSYNC_HOME from
# the host system inside of the container, and expect environment to be prepared for the launch.
docker run --mount type=bind,src=$ZKSYNC_HOME,dst=/usr/src/zksync matterlabs/ci-integration-test:latest bash -c "/usr/local/bin/entrypoint.sh && $1"
docker run -v $ZKSYNC_HOME:/usr/src/zksync matterlabs/ci-integration-test:latest bash -c "/usr/local/bin/entrypoint.sh && $1"
5 changes: 5 additions & 0 deletions docker/integration-test/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ nohup /usr/local/bin/geth-entry.sh &>/dev/null &
service postgresql restart
zksync db-setup

# Compile required dependencies
f cargo build --bin zksync_server --release
f cargo build --bin dummy_prover --release
f cargo build --bin dev-ticker-server --release

# Prepare dummy-prover in the contract (so the redeployed version will be OK)
zksync dummy-prover enable-no-redeploy

Expand Down

0 comments on commit 86d4754

Please sign in to comment.