From efa664505ae57becf14023fa656060187fa3449b Mon Sep 17 00:00:00 2001 From: 0xfourzerofour Date: Mon, 28 Aug 2023 10:22:51 -0400 Subject: [PATCH] feat(ci): move some logic to the action --- .github/workflows/ci-test.yml | 5 ++--- test/spec-tests/ci/run-spec-tests.sh | 4 +--- .../launchers/rundler-launcher/rundler-launcher.sh | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index c2cf4de3d..49225a5c4 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -54,9 +54,8 @@ jobs: compose-file: "./test/spec-tests/launchers/rundler-launcher/docker-compose.yml" env: TAG: "latest" - - # - name: run spec tests - # run: ./test/spec-tests/ci/run-spec-tests.sh + - name: run spec tests + run: ./test/spec-tests/ci/run-spec-tests.sh lint: runs-on: ubuntu-latest diff --git a/test/spec-tests/ci/run-spec-tests.sh b/test/spec-tests/ci/run-spec-tests.sh index 2cc4e0e52..9a1e304d0 100755 --- a/test/spec-tests/ci/run-spec-tests.sh +++ b/test/spec-tests/ci/run-spec-tests.sh @@ -2,9 +2,7 @@ set -x cd "$(dirname "$0")" -(cd ../bundler-spec-tests && pdm install && pdm run update-deps) - -docker build ../../.. -t alchemy-platform/rundler:latest +(cd ../bundler-spec-tests && pdm run update-deps) (cd ../bundler-spec-tests && pdm run test --launcher-script=../launchers/rundler-launcher/rundler-launcher.sh $@) diff --git a/test/spec-tests/launchers/rundler-launcher/rundler-launcher.sh b/test/spec-tests/launchers/rundler-launcher/rundler-launcher.sh index 9ff4d7dc7..3bd99aaa7 100755 --- a/test/spec-tests/launchers/rundler-launcher/rundler-launcher.sh +++ b/test/spec-tests/launchers/rundler-launcher/rundler-launcher.sh @@ -10,12 +10,11 @@ case $1 in ;; start) - docker-compose up -d --wait cast send --from $(cast rpc eth_accounts | tail -n 1 | tr -d '[]"') --value 1ether 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 > /dev/null cd ../../bundler-spec-tests/@account-abstraction && yarn deploy --network localhost ;; stop) - docker-compose down -t 3 + echo "stopping" ;; *)