Skip to content
This repository was archived by the owner on Nov 6, 2022. It is now read-only.

Commit d7125de

Browse files
updated build
1 parent 8b465a3 commit d7125de

25 files changed

+182
-179
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,15 @@ jobs:
9898
sudo npm install -g yarn && cd contracts && yarn install
9999
100100
- name: Make and test ArbOS
101-
run: make clean && make
101+
run: make clean && make -j ci compile_options="-w"
102102

103-
- name: Check if ArbOS changed
103+
- name: Check if ArbOS or replayTests changed
104104
run: git update-index --refresh && git diff-index HEAD --
105105

106106
- name: Create code-coverage files if supported for rust ${{ matrix.rust }}
107107
if: matrix.rust == 'nightly'
108108
run: |
109109
grcov . --binary-path ./target/release/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
110-
make coverage
111110
112111
- name: Upload to codecov.io
113112
uses: codecov/codecov-action@v1
@@ -124,7 +123,7 @@ jobs:
124123
steps:
125124
- name: Checkout
126125
uses: actions/checkout@v1
127-
126+
128127
- name: Install dependencies
129128
run: |
130129
sudo add-apt-repository -y ppa:longsleep/golang-backports
@@ -138,6 +137,7 @@ jobs:
138137
# git clone -b v6.11.4 https://github.com/facebook/rocksdb
139138
# cd rocksdb && make shared_lib && sudo make install
140139
#
140+
curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v1.7.0/gotestsum_1.7.0_linux_amd64.tar.gz" | sudo tar -xz -C /usr/local/bin gotestsum
141141
142142
- name: Clone Arbitrum
143143
run: |
@@ -147,6 +147,8 @@ jobs:
147147
- name: Copy over this branch's ArbOS
148148
run: |
149149
rm -r arbitrum/packages/arb-os/*
150+
# We'd need `make testlogs` to generate these files
151+
# cp -r testlogs/* arbitrum/packages/arb-avm-cpp/tests/arbos-cases/
150152
mv * arbitrum/packages/arb-os/ || true
151153
152154
- name: Build Arbitrum
@@ -158,14 +160,14 @@ jobs:
158160
159161
- name: Test Node's C++ Database
160162
run: |
161-
./arbitrum/packages/arb-avm-cpp/debug/bin/avm_tests
162-
163-
- name: Test Node's RPC
164-
run: |
165-
cd arbitrum/packages/arb-rpc-node/
166-
go test ./...
163+
./arbitrum/packages/arb-avm-cpp/build/bin/avm_tests
167164
168165
- name: Test Node's Core
169166
run: |
170167
cd arbitrum/packages/arb-node-core/
171-
go test ./...
168+
gotestsum --format testname | tee issues | grep FAIL
169+
170+
- name: Test Node's RPC
171+
run: |
172+
cd arbitrum/packages/arb-rpc-node/
173+
gotestsum --format testname | tee issues | grep FAIL

.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ arb_os/contractTemplates.mini
1818
.idea
1919
evm-tests/.travis.yml
2020
evm-test-logs/*
21-
**.cov
2221
**.bkp
2322
**~
2423
lcov.info
2524
lcov-mini.info
26-
**.dot
2725

2826
# Files generated by Hardhat
2927
contracts/artifacts
@@ -35,3 +33,14 @@ arb_os/save_bridge_for_debugging.mini
3533
# Tooling
3634
flamegraph.svg
3735
perf.data
36+
**.dot
37+
38+
# coverage files
39+
**.all
40+
**.cov
41+
**.partial
42+
43+
# auto-generated files
44+
.make/
45+
arb_os/bridge_arbos_versions.mini
46+
arb_os/arbos-upgrade-base.mexe

Makefile

Lines changed: 143 additions & 136 deletions
Large diffs are not rendered by default.

arb_os/arbos.mexe

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

arb_os/bridge_arbos_versions.mini

Lines changed: 0 additions & 16 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

looptest/upgrade2_new.mexe

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.

replayTests/evm_direct_deploy_add.aoslog

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

replayTests/evm_direct_deploy_and_call_add.aoslog

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

replayTests/evm_direct_deploy_and_compressed_call_add.aoslog

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

replayTests/evm_eval_sha256.aoslog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"80"},{"Buffer":"1567aa7175e04611d194275bb504cc64e920959dd01df9d86ab047367aa4c5340000000000000000000000000000000000000000000000000000000000000000625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"401"},{"Int":"1"},{"Int":"77359400"},{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"401"},{"Int":"7da3cdb0e6719e006a5ddcdc497343c054123d623187d251ac2652299e398e26"},{"Tuple":[{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]},{"Tuple":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"2e8"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"20"},{"Buffer":"1dd8312636f6a0bf3d21fa2855e63072507453e93a5ced4301b364e91c9d87d6"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"d1"},{"Int":"0"}]},{"Tuple":[{"Int":"d1"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"2e8"},{"Int":"0"},{"Int":"d1"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]}]}],"sends":[],"total_gas":1462218}
1+
{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"80"},{"Buffer":"1567aa7175e04611d194275bb504cc64e920959dd01df9d86ab047367aa4c5340000000000000000000000000000000000000000000000000000000000000000625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"401"},{"Int":"1"},{"Int":"77359400"},{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"401"},{"Int":"7da3cdb0e6719e006a5ddcdc497343c054123d623187d251ac2652299e398e26"},{"Tuple":[{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]},{"Tuple":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"2e8"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"20"},{"Buffer":"1dd8312636f6a0bf3d21fa2855e63072507453e93a5ced4301b364e91c9d87d6"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"d1"},{"Int":"0"}]},{"Tuple":[{"Int":"d1"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"2e8"},{"Int":"0"},{"Int":"d1"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]}]}],"sends":[],"total_gas":1462194}

replayTests/evm_test_arbsys.aoslog

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

replayTests/evm_test_arbsys_direct.aoslog

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

replayTests/evm_test_create.aoslog

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)