Skip to content

Commit

Permalink
pull v0.6 submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
drortirosh committed Mar 18, 2024
1 parent 60c381c commit a39cb71
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
# path: bundler-spec-tests
# submodules: true

- run: test -d bundler-spec-tests || git clone --recurse-submodules --depth 1 https://github.com/eth-infinitism/bundler-spec-tests
- run: test -d bundler-spec-tests || git clone -b releases/v0.6 --recurse-submodules https://github.com/eth-infinitism/bundler-spec-tests
name: clone bundler-spec-tests

- run: cd bundler-spec-tests && (git describe --tags; git submodule ) | tee .git.status
Expand Down Expand Up @@ -95,6 +95,16 @@ jobs:
- name: "Test summary"
run: "grep -r '===.* in ' `find . -path '*build/out*txt'`| sed -e 's/===*//g' "

- name: Zip build output
run: zip -r ./build.zip ./build

- name: Push build output to artifacts
uses: actions/upload-artifact@v3
with:
name: build
path: ./build.zip
retention-days: 2

- name: dump logs
if: ${{ inputs.dump_logs }}
run: for d in build/*/*.log; do echo === $d:; cat $d | perl -pe 's/(?:runbundler-)?(\S+?)(?:-1)?[\s|]+(\S+)/$2 $1 /' | sort ; done
Expand All @@ -117,4 +127,3 @@ jobs:
concurrency:
group: "deploy"
cancel-in-progress: true

6 changes: 3 additions & 3 deletions runall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ root=`realpath \`dirname $0\``

BUILD=$root/build
OUT=$BUILD/out
test -d bundler-spec-tests || git clone https://github.com/eth-infinitism/bundler-spec-tests.git
test -d bundler-spec-tests || git clone -b releases/v0.6 --recurse-submodules https://github.com/eth-infinitism/bundler-spec-tests.git

#by default, run all single-bundler configs
BUNDLERS=`ls $root/bundlers/*/*yml|grep -v p2p`
Expand Down Expand Up @@ -48,7 +48,7 @@ function getEnv {
name=$2
def=$3

val=`sh -c "source $envFile; echo \\\$$name"`
val=`bash -c "source $envFile; echo \\\$$name"`
echo ${val:-$def}
}

Expand All @@ -63,7 +63,7 @@ if $root/runbundler/runbundler.sh $bundler pull-start; then

echo "`date`: started bundler $bundler, name=$name" | tee -a $outraw

case "$bunder" in
case "$bundler" in
*yml) PYTEST_FOLDER=`getEnv $root/runbundler/runbundler.env PYTEST_FOLDER tests/single` ;;
*env) PYTEST_FOLDER=`getEnv $bundler PYTEST_FOLDER tests/p2p` ;;
esac
Expand Down

0 comments on commit a39cb71

Please sign in to comment.