diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 8016542..daca9c7 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -22,9 +22,13 @@ jobs: git submodule init git submodule update + - name: Build + run: | + make all + - name: Test run: | - bash test.sh --suppress-output + ./test.sh -l --suppress-output - name: Upload Log Artifacts uses: actions/upload-artifact@v2 diff --git a/Makefile b/Makefile index 282fb7c..1f7a763 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ .PHONY: all integration-tests deployer geth-l2 batch-submitter data-transport-layer test +SHELL := /bin/bash + all: @echo "Building in parallel in the background" ./build-local.sh - @while :; do [[ $$(docker ps --format='{{.Image}}' | grep builder | wc -l) == 0 ]] && exit 0; sleep 2; done; + @while :; do [ $$(docker ps --format='{{.Image}}' | grep builder | wc -l) == 0 ] && exit 0; sleep 2; done; up-local: ./up.sh -l diff --git a/go-ethereum b/go-ethereum index b54a387..4b49dc6 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit b54a387538c9272274ad38ae96c3951a2f652571 +Subproject commit 4b49dc6a0f1ce8bb946da204f0578db5edd64532 diff --git a/integration-tests b/integration-tests index 5711c64..93b72ab 160000 --- a/integration-tests +++ b/integration-tests @@ -1 +1 @@ -Subproject commit 5711c6448b877b480a3e5a080d4d290b19d853ee +Subproject commit 93b72ab541cf698830dc83d062792a5ffe123621