Skip to content

Commit

Permalink
Skip rust workflow on push to main
Browse files Browse the repository at this point in the history
Move e2e test back to github
  • Loading branch information
jmrossy committed Nov 26, 2023
1 parent deb4ab7 commit d850f99
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 73 deletions.
65 changes: 0 additions & 65 deletions .github/workflows/mergify.yml.bak

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/rust-skipped.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
name: rust

on:
push:
branches: [main]
pull_request:
branches: [main, v3]
branches: [main]
paths-ignore:
- 'rust/**'
- .github/workflows/rust.yml

env:
CARGO_TERM_COLOR: always
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: rust

on:
push:
branches: [main]
pull_request:
branches: [main]
paths:
- 'rust/**'
- .github/workflows/rust.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
run: yarn test

e2e:
runs-on: arc-runner-set
runs-on: larger-runner
needs: [yarn-build]
steps:
- uses: actions/setup-node@v3
Expand Down
12 changes: 8 additions & 4 deletions typescript/cli/ci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ yarn workspace @hyperlane-xyz/cli run hyperlane send transfer \
MESSAGE2_ID=`cat /tmp/message2 | grep "Message ID" | grep -E -o '0x[0-9a-f]+'`
echo "Message 2 ID: $MESSAGE2_ID"

echo "Pre-building validator with cargo"
cargo build --release --bin validator

ANVIL_CONNECTION_URL="http://127.0.0.1"
cd ../../rust
for i in "anvil1 8545 ANVIL1" "anvil2 8555 ANVIL2"
Expand All @@ -126,14 +129,16 @@ done

echo "Validator running, sleeping to let it sync"
# This needs to be long to allow time for the cargo build to finish
sleep 120
sleep 20
echo "Done sleeping"

echo "Validator Announcement:"
cat /tmp/anvil1/validator/announcement.json

echo "Running relayer"
echo "Pre-building relayer with cargo"
cargo build --release --bin relayer

echo "Running relayer"
export HYP_RELAYCHAINS=anvil1,anvil2
export HYP_ALLOWLOCALCHECKPOINTSYNCERS=true
export HYP_DB=/tmp/relayer
Expand All @@ -142,11 +147,10 @@ export HYP_CHAINS_ANVIL1_SIGNER_TYPE=hexKey
export HYP_CHAINS_ANVIL1_SIGNER_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97
export HYP_CHAINS_ANVIL2_SIGNER_TYPE=hexKey
export HYP_CHAINS_ANVIL2_SIGNER_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97

cargo run --bin relayer > /tmp/relayer/relayer-logs.txt &

# This needs to be long to allow time for the cargo build to finish
sleep 60
sleep 20
echo "Done running relayer, checking message delivery statuses"

for i in "1 $MESSAGE1_ID" "2 $MESSAGE2_ID"
Expand Down

0 comments on commit d850f99

Please sign in to comment.